xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

lignite, coke, desh bullet, difurnace rework

Browse Source
This commit is contained in:
HbmMods 2019-02-27 20:53:56 +01:00
parent 1fb362807a
commit b90ecc152b
31 changed files with 165 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
assets/hbm/lang/de_DE.lang
View File

@ -514,6 +514,10 @@ container.amsEmitter=AMS-Emitter [WIP]
tile.ams_base.name=AMS-Basis [WIP]
container.amsBase=AMS-Basis [WIP]
tile.dfc_emitter.name=[WIP]
tile.dfc_receiver.name=[WIP]
tile.dfc_injector.name=[WIP]
item.template_folder.name=Produktionsvorlagen-Zeichenmappe
item.fluid_identifier.name=Flüssigkeits-Kennzeichnung
item.assembly_template.name=Fertigungsvorlage:
@ -615,6 +619,10 @@ item.ingot_saturnite.name=Saturnitbarren
item.plate_saturnite.name=Saturnitplatte
item.solid_fuel.name=Festbrennstoff
item.coke.name=Koks
item.lignite.name=Braunkohle
item.briquette_lignite.name=Braunkohlebrikett
item.powder_lignite.name=Braunkohlestaub
item.nugget_th232.name=Th232-Nugget
item.nugget_u233.name=U233-Nugget
@ -670,6 +678,7 @@ item.assembly_lead.name=Glaspatronensatz
item.assembly_gold.name=Goldpatronensatz
item.assembly_schrabidium.name=Schrabidiumpatronensatz
item.assembly_nightmare.name=Nightmare-Patronensatz
item.assembly_desh.name=Desh-Patronensatz
item.assembly_pip.name=Verdorbener .44er Patronensatz
item.assembly_nopip.name=.44er Patronensatz
item.assembly_smg.name=9mm Patronensatz
@ -719,6 +728,7 @@ tile.ore_uranium.name=Uranerz
tile.ore_thorium.name=Thoriumerz
tile.ore_schrabidium.name=Schrabidiumerz
tile.ore_beryllium.name=Berylliumerz
tile.ore_lignite.name=Braunkohleerz
tile.ore_nether_uranium.name=Nether-Uranerz
tile.ore_nether_plutonium.name=Nether-Plutoniumerz
@ -1395,6 +1405,7 @@ item.ammo_22lr_ap.name=.22 LR Patrone (Panzerbrechend)
item.ammo_folly_taint.name=Silbernes Geschoss (Original)
item.ammo_folly_nuclear.name=Silbernes Geschoss (Atomar)
item.ammo_folly_du.name=Silbernes Geschoss (DU, Nicht-Explosiv)
item.ammo_357_desh.name=.357 Magnum Deshkugel
item.ammo_44.name=.44 Magnum Patrone
item.ammo_44_ap.name=.44 Magnum Patrone (Panzerbrechend)
item.ammo_44_du.name=.44 Magnum Patrone (DU)
@ -1595,6 +1606,7 @@ item.missile_strong.name=Starke HE Rakete
item.missile_incendiary_strong.name=Starke Brandrakete
item.missile_cluster_strong.name=Starke Streurakete
item.missile_buster_strong.name=Verbesserte bunkerbrechende Rakete
item.missile_emp_strong.name=Verbesserte EMP-Rakete
item.missile_burst.name=Spare Missile
item.missile_inferno.name=Inferno Missile G.R.N. Mk.II
item.missile_rain.name=Schüttbombenregen
@ -1793,6 +1805,7 @@ tile.absorber_red.name=Verbesserter Strahlungs-Absorber
tile.absorber_green.name=Fortgeschrittener Strahlungs-Absorber
tile.absorber_pink.name=Elite Strahlungs-Absorber
tile.decon.name=Spieler-Dekontaminierer
tile.machine_amgen.name=Umgebungsstrahlungs-Generator
item.schrabidium_hammer.name=Schrabidiumhammer
item.shimmer_sledge.name=Shimmer Sledge

13
assets/hbm/lang/en_US.lang
View File

@ -514,6 +514,10 @@ container.amsEmitter=AMS Emitter [WIP]
tile.ams_base.name=AMS Base [WIP]
container.amsBase=AMS Base [WIP]
tile.dfc_emitter.name=[WIP]
tile.dfc_receiver.name=[WIP]
tile.dfc_injector.name=[WIP]
item.template_folder.name=Machine Template Folder
item.fluid_identifier.name=Fluid Identifier
item.assembly_template.name=Assembly Template:
@ -615,6 +619,10 @@ item.ingot_saturnite.name=Saturnite Ingot
item.plate_saturnite.name=Saturnite Plate
item.solid_fuel.name=Solid Fuel
item.coke.name=Coke
item.lignite.name=Lignite
item.briquette_lignite.name=Lignite Briquette
item.powder_lignite.name=Lignite Powder
item.nugget_th232.name=Th232 Nugget
item.nugget_u233.name=U233 Nugget
@ -670,6 +678,7 @@ item.assembly_lead.name=Glass Bullet Assembly
item.assembly_gold.name=Gold Bullet Assembly
item.assembly_schrabidium.name=Schrabidium Bullet Assembly
item.assembly_nightmare.name=Nightmare Bullet Assembly
item.assembly_desh.name=Desh Bullet Assembly
item.assembly_pip.name=Tainted Bullet Assembly
item.assembly_nopip.name=.44 Magnum Assembly
item.assembly_smg.name=9mm Assembly
@ -719,6 +728,7 @@ tile.ore_uranium.name=Uranium Ore
tile.ore_thorium.name=Thorium Ore
tile.ore_schrabidium.name=Schrabidium Ore
tile.ore_beryllium.name=Beryllium Ore
tile.ore_lignite.name=Lignite Ore
tile.ore_nether_uranium.name=Nether Uranium Ore
tile.ore_nether_plutonium.name=Nether Plutonium Ore
@ -1395,6 +1405,7 @@ item.ammo_22lr_ap.name=.22 LR Round (Armor Piercing)
item.ammo_folly.name=Silver Bullet (Original)
item.ammo_folly_nuclear.name=Silver Bullet (Nuclear)
item.ammo_folly_du.name=Silver Bullet (DU, Non-Explosive)
item.ammo_357_desh.name=.357 Magnum Desh Bullet
item.ammo_44.name=.44 Magnum Bullet
item.ammo_44_ap.name=.44 Magnum Bullet (Armor Piercing)
item.ammo_44_du.name=.44 Magnum Bullet (DU)
@ -1595,6 +1606,7 @@ item.missile_strong.name=Strong HE Missile
item.missile_incendiary_strong.name=Strong Incendiary Missile
item.missile_cluster_strong.name=Strong Cluster Missile
item.missile_buster_strong.name=Enhanced Bunker Buster
item.missile_emp_strong.name=Strong EMP Missile
item.missile_burst.name=Spare Missile
item.missile_inferno.name=Inferno Missile G.R.N. Mk.II
item.missile_rain.name=Bomblet Rain
@ -1793,6 +1805,7 @@ tile.absorber_red.name=Enhanced Radiation Absorber
tile.absorber_green.name=Advanced Radiation Absorber
tile.absorber_pink.name=Elite Radiation Absorber
tile.decon.name=Player Decontaminator
tile.machine_amgen.name=Ambience Radiation Generator
item.schrabidium_hammer.name=Schrabidium Hammer
item.shimmer_sledge.name=Shimmer Sledge

BIN
assets/hbm/textures/blocks/dfc_emitter.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 264 B

BIN
assets/hbm/textures/blocks/dfc_injector.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 242 B

BIN
assets/hbm/textures/blocks/dfc_receiver.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 209 B

BIN
assets/hbm/textures/blocks/ore_lignite.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 460 B

BIN
assets/hbm/textures/items/battery_advanced_new.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 319 B

BIN
assets/hbm/textures/items/battery_creative_new.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 314 B

BIN
assets/hbm/textures/items/battery_generic_new.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 318 B

BIN
assets/hbm/textures/items/battery_schrabidium_new.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 282 B

BIN
assets/hbm/textures/items/briquette_lignite.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 267 B

BIN
assets/hbm/textures/items/coke.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 329 B

BIN
assets/hbm/textures/items/lignite.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 353 B

BIN
assets/hbm/textures/items/powder_lignite.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 346 B

5
com/hbm/blocks/ModBlocks.java
View File

@ -78,6 +78,7 @@ public class ModBlocks {
public static Block ore_oil;
public static Block ore_oil_empty;
public static Block ore_oil_sand;
public static Block ore_lignite;
public static Block ore_tikite;
@ -676,6 +677,7 @@ public class ModBlocks {
ore_lead = new BlockGeneric(Material.rock).setBlockName("ore_lead").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_lead");
ore_schrabidium = new BlockOre(Material.rock, 0.1F, 0.5F).setBlockName("ore_schrabidium").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":ore_schrabidium");
ore_beryllium = new BlockGeneric(Material.rock).setBlockName("ore_beryllium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":ore_beryllium");
ore_lignite = new BlockOre(Material.rock).setBlockName("ore_lignite").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":ore_lignite");
ore_nether_uranium = new BlockOre(Material.rock).setBlockName("ore_nether_uranium").setCreativeTab(MainRegistry.blockTab).setHardness(0.4F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_uranium");
ore_nether_plutonium = new BlockGeneric(Material.rock).setBlockName("ore_nether_plutonium").setCreativeTab(MainRegistry.blockTab).setHardness(0.4F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_plutonium");
@ -754,7 +756,7 @@ public class ModBlocks {
brick_concrete = new BlockGeneric(Material.rock).setBlockName("brick_concrete").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":brick_concrete");
brick_obsidian = new BlockGeneric(Material.rock).setBlockName("brick_obsidian").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(8000.0F).setBlockTextureName(RefStrings.MODID + ":brick_obsidian");
brick_light = new BlockGeneric(Material.rock).setBlockName("brick_light").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(1000.0F).setBlockTextureName(RefStrings.MODID + ":brick_light");
brick_compound = new BlockGeneric(Material.rock).setBlockName("brick_compound").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(3000.0F).setBlockTextureName(RefStrings.MODID + ":brick_compound");
brick_compound = new BlockGeneric(Material.rock).setBlockName("brick_compound").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(10000.0F).setBlockTextureName(RefStrings.MODID + ":brick_compound");
cmb_brick = new BlockGeneric(Material.rock).setBlockName("cmb_brick").setCreativeTab(MainRegistry.blockTab).setHardness(25.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":cmb_brick");
cmb_brick_reinforced = new BlockGeneric(Material.rock).setBlockName("cmb_brick_reinforced").setCreativeTab(MainRegistry.blockTab).setHardness(25.0F).setResistance(60000.0F).setBlockTextureName(RefStrings.MODID + ":cmb_brick_reinforced");
@ -1173,6 +1175,7 @@ public class ModBlocks {
GameRegistry.registerBlock(ore_oil, ore_oil.getUnlocalizedName());
GameRegistry.registerBlock(ore_oil_empty, ore_oil_empty.getUnlocalizedName());
GameRegistry.registerBlock(ore_oil_sand, ore_oil_sand.getUnlocalizedName());
GameRegistry.registerBlock(ore_lignite, ore_lignite.getUnlocalizedName());
GameRegistry.registerBlock(ore_schrabidium, ItemSchrabidiumBlock.class, ore_schrabidium.getUnlocalizedName());
//Rare Minerals

5
com/hbm/blocks/generic/BlockCrate.java
View File

@ -112,7 +112,10 @@ public class BlockCrate extends BlockFalling {
BlockCrate.addToListWithWeight(weaponList, ModItems.gun_revolver_pip, 3);
BlockCrate.addToListWithWeight(weaponList, ModItems.gun_calamity, 3);
BlockCrate.addToListWithWeight(weaponList, ModItems.gun_calamity_dual, 2);
BlockCrate.addToListWithWeight(weaponList, ModItems.gun_rpg, 8);
BlockCrate.addToListWithWeight(weaponList, ModItems.gun_rpg, 7);
BlockCrate.addToListWithWeight(weaponList, ModItems.gun_karl, 4);
BlockCrate.addToListWithWeight(weaponList, ModItems.gun_panzerschreck, 6);
BlockCrate.addToListWithWeight(weaponList, ModItems.gun_hk69, 8);
BlockCrate.addToListWithWeight(weaponList, ModItems.gun_stinger, 7);
BlockCrate.addToListWithWeight(weaponList, ModItems.gun_fatman, 5);
BlockCrate.addToListWithWeight(weaponList, ModItems.gun_proto, 3);

4
com/hbm/blocks/generic/BlockOre.java
View File

@ -178,6 +178,10 @@ public class BlockOre extends Block {
{
return ModItems.ingot_tungsten;
}
if(this == ModBlocks.ore_lignite)
{
return ModItems.lignite;
}
return Item.getItemFromBlock(this);
}

2
com/hbm/handler/BulletConfigSyncingUtil.java
View File

@ -36,6 +36,7 @@ public class BulletConfigSyncingUtil {
public static final int NIGHT_REVOLVER = 0x07;
public static final int NIGHT2_REVOLVER = 0x08;
public static final int SATURNITE_REVOLVER = 0x09;
public static final int DESH_REVOLVER = 0x0A;
public static final int G20_NORMAL = 0x10;
public static final int G20_SLUG = 0x11;
@ -104,6 +105,7 @@ public class BulletConfigSyncingUtil {
configSet.add(new ConfigKeyPair(Gun357MagnumFactory.getRevNightmareConfig(), NIGHT_REVOLVER));
configSet.add(new ConfigKeyPair(Gun357MagnumFactory.getRevNightmare2Config(), NIGHT2_REVOLVER));
configSet.add(new ConfigKeyPair(Gun357MagnumFactory.getRevSteelConfig().setToFire(3), SATURNITE_REVOLVER));
configSet.add(new ConfigKeyPair(Gun357MagnumFactory.getRevDeshConfig(), DESH_REVOLVER));
configSet.add(new ConfigKeyPair(Gun20GaugeFactory.get20GaugeConfig(), G20_NORMAL));
configSet.add(new ConfigKeyPair(Gun20GaugeFactory.get20GaugeSlugConfig(), G20_SLUG));

8
com/hbm/handler/FuelHandler.java
View File

@ -26,6 +26,14 @@ public class FuelHandler implements IFuelHandler {
return 6400;
if(fuel.getItem().equals(Item.getItemFromBlock(ModBlocks.block_scrap)))
return 4000;
if(fuel.getItem() == ModItems.lignite)
return 1200;
if(fuel.getItem() == ModItems.powder_lignite)
return 1200;
if(fuel.getItem() == ModItems.briquette_lignite)
return 1600;
if(fuel.getItem() == ModItems.coke)
return 3200;
return 0;
}

19
com/hbm/handler/guncfg/Gun357MagnumFactory.java
View File

@ -48,6 +48,7 @@ public class Gun357MagnumFactory {
config.config = new ArrayList<Integer>();
config.config.add(BulletConfigSyncingUtil.IRON_REVOLVER);
config.config.add(BulletConfigSyncingUtil.DESH_REVOLVER);
return config;
}
@ -63,6 +64,7 @@ public class Gun357MagnumFactory {
config.config = new ArrayList<Integer>();
config.config.add(BulletConfigSyncingUtil.STEEL_REVOLVER);
config.config.add(BulletConfigSyncingUtil.DESH_REVOLVER);
return config;
}
@ -78,6 +80,7 @@ public class Gun357MagnumFactory {
config.config = new ArrayList<Integer>();
config.config.add(BulletConfigSyncingUtil.SATURNITE_REVOLVER);
config.config.add(BulletConfigSyncingUtil.DESH_REVOLVER);
return config;
}
@ -93,6 +96,7 @@ public class Gun357MagnumFactory {
config.config = new ArrayList<Integer>();
config.config.add(BulletConfigSyncingUtil.LEAD_REVOLVER);
config.config.add(BulletConfigSyncingUtil.DESH_REVOLVER);
return config;
}
@ -108,6 +112,7 @@ public class Gun357MagnumFactory {
config.config = new ArrayList<Integer>();
config.config.add(BulletConfigSyncingUtil.GOLD_REVOLVER);
config.config.add(BulletConfigSyncingUtil.DESH_REVOLVER);
return config;
}
@ -126,6 +131,7 @@ public class Gun357MagnumFactory {
config.config = new ArrayList<Integer>();
config.config.add(BulletConfigSyncingUtil.CURSED_REVOLVER);
config.config.add(BulletConfigSyncingUtil.DESH_REVOLVER);
return config;
}
@ -142,6 +148,7 @@ public class Gun357MagnumFactory {
config.config = new ArrayList<Integer>();
config.config.add(BulletConfigSyncingUtil.SCHRABIDIUM_REVOLVER);
config.config.add(BulletConfigSyncingUtil.DESH_REVOLVER);
return config;
}
@ -158,6 +165,7 @@ public class Gun357MagnumFactory {
config.config = new ArrayList<Integer>();
config.config.add(BulletConfigSyncingUtil.NIGHT_REVOLVER);
config.config.add(BulletConfigSyncingUtil.DESH_REVOLVER);
return config;
}
@ -231,6 +239,17 @@ public class Gun357MagnumFactory {
return bullet;
}
public static BulletConfiguration getRevDeshConfig() {
BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig();
bullet.ammo = ModItems.ammo_357_desh;
bullet.dmgMin = 15;
bullet.dmgMax = 17;
return bullet;
}
public static BulletConfiguration getRevSchrabidiumConfig() {
BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig();

14
com/hbm/inventory/MachineRecipes.java
View File

@ -557,6 +557,8 @@ public class MachineRecipes {
return new ItemStack(Items.diamond);
if(input.getItem() == ModItems.biomass)
return new ItemStack(ModItems.biomass_compressed);
if(input.getItem() == ModItems.powder_lignite)
return new ItemStack(ModItems.briquette_lignite);
}
if(stamps_plate.contains(stamp.getItem())) {
@ -632,6 +634,8 @@ public class MachineRecipes {
return new ItemStack(ModItems.gun_revolver_schrabidium_ammo);
if(input.getItem() == ModItems.assembly_nightmare)
return new ItemStack(ModItems.gun_revolver_nightmare_ammo);
if(input.getItem() == ModItems.assembly_desh)
return new ItemStack(ModItems.ammo_357_desh);
if(mODE(input, "ingotSteel"))
return new ItemStack(ModItems.gun_revolver_cursed_ammo);
@ -698,6 +702,7 @@ public class MachineRecipes {
recipes.put(new Object[] { i_stamps_flat, new ItemStack(ModItems.powder_emerald) }, getPressResultNN(stamps_flat.get(0), ModItems.powder_emerald));
recipes.put(new Object[] { i_stamps_flat, new ItemStack(ModItems.pellet_coal) }, getPressResultNN(stamps_flat.get(0), ModItems.pellet_coal));
recipes.put(new Object[] { i_stamps_flat, new ItemStack(ModItems.biomass) }, getPressResultNN(stamps_flat.get(0), ModItems.biomass));
recipes.put(new Object[] { i_stamps_flat, new ItemStack(ModItems.powder_lignite) }, getPressResultNN(stamps_flat.get(0), ModItems.powder_lignite));
recipes.put(new Object[] { i_stamps_plate, new ItemStack(Items.iron_ingot) }, getPressResultNN(stamps_plate.get(0), Items.iron_ingot));
recipes.put(new Object[] { i_stamps_plate, new ItemStack(Items.gold_ingot) }, getPressResultNN(stamps_plate.get(0), Items.gold_ingot));
@ -729,6 +734,7 @@ public class MachineRecipes {
recipes.put(new Object[] { i_stamps_357, new ItemStack(ModItems.assembly_schrabidium) }, getPressResultNN(i_stamps_357.get(0).getItem(), ModItems.assembly_schrabidium));
recipes.put(new Object[] { i_stamps_357, new ItemStack(ModItems.ingot_steel) }, getPressResultNN(i_stamps_357.get(0).getItem(), ModItems.ingot_steel));
recipes.put(new Object[] { i_stamps_357, new ItemStack(ModItems.assembly_nightmare) }, getPressResultNN(i_stamps_357.get(0).getItem(), ModItems.assembly_nightmare));
recipes.put(new Object[] { i_stamps_357, new ItemStack(ModItems.assembly_desh) }, getPressResultNN(i_stamps_357.get(0).getItem(), ModItems.assembly_desh));
recipes.put(new Object[] { i_stamps_44, new ItemStack(ModItems.assembly_nopip) }, getPressResultNN(i_stamps_44.get(0).getItem(), ModItems.assembly_nopip));
//recipes.put(new Object[] { i_stamps_44, new ItemStack(ModItems.assembly_pip) }, getPressResultNN(i_stamps_44.get(0).getItem(), ModItems.assembly_pip));
@ -1194,11 +1200,13 @@ public class MachineRecipes {
fuels.add(new ItemStack(Items.coal));
fuels.add(new ItemStack(Item.getItemFromBlock(Blocks.coal_block)));
fuels.add(new ItemStack(Items.lava_bucket));
fuels.add(new ItemStack(Items.redstone));
fuels.add(new ItemStack(Item.getItemFromBlock(Blocks.redstone_block)));
fuels.add(new ItemStack(Item.getItemFromBlock(Blocks.netherrack)));
fuels.add(new ItemStack(Items.blaze_rod));
fuels.add(new ItemStack(Items.blaze_powder));
fuels.add(new ItemStack(ModItems.lignite));
fuels.add(new ItemStack(ModItems.powder_lignite));
fuels.add(new ItemStack(ModItems.briquette_lignite));
fuels.add(new ItemStack(ModItems.coke));
fuels.add(new ItemStack(ModItems.powder_coal));
return fuels;
}

26
com/hbm/items/ModItems.java
View File

@ -62,6 +62,11 @@ public class ModItems {
public static Item ingot_neptunium;
public static Item ingot_titanium;
public static Item sulfur;
public static Item coke;
public static Item lignite;
public static Item powder_lignite;
public static Item briquette_lignite;
public static Item niter;
public static Item ingot_copper;
@ -321,6 +326,7 @@ public class ModItems {
public static Item assembly_gold;
public static Item assembly_schrabidium;
public static Item assembly_nightmare;
public static Item assembly_desh;
//public static Item assembly_pip;
public static Item assembly_nopip;
public static Item assembly_smg;
@ -1655,8 +1661,12 @@ public class ModItems {
ingot_lanthanium = new ItemCustomLore().setUnlocalizedName("ingot_lanthanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_lanthanium");
ingot_actinium = new ItemCustomLore().setUnlocalizedName("ingot_actinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_actinium");
solid_fuel = new Item().setUnlocalizedName("solid_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":solid_fuel");
coke = new Item().setUnlocalizedName("coke").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coke");
lignite = new Item().setUnlocalizedName("lignite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":lignite");
briquette_lignite = new Item().setUnlocalizedName("briquette_lignite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":briquette_lignite");
powder_lignite = new Item().setUnlocalizedName("powder_lignite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_lignite");
ingot_australium = new ItemCustomLore().setUnlocalizedName("ingot_australium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_australium");
ingot_weidanium = new ItemCustomLore().setUnlocalizedName("ingot_weidanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_weidanium");
@ -1912,6 +1922,7 @@ public class ModItems {
assembly_gold = new Item().setUnlocalizedName("assembly_gold").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":assembly_gold");
assembly_schrabidium = new Item().setUnlocalizedName("assembly_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":assembly_schrabidium");
assembly_nightmare = new Item().setUnlocalizedName("assembly_nightmare").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":assembly_nightmare");
assembly_desh = new Item().setUnlocalizedName("assembly_desh").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":assembly_desh");
//assembly_pip = new Item().setUnlocalizedName("assembly_pip").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":assembly_pip");
assembly_nopip = new Item().setUnlocalizedName("assembly_nopip").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":assembly_nopip");
assembly_smg = new Item().setUnlocalizedName("assembly_smg").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":assembly_smg");
@ -2547,12 +2558,12 @@ public class ModItems {
custom_schrab = new ItemCustomLore().setUnlocalizedName("custom_schrab").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":custom_schrab");
custom_fall = new ItemCustomLore().setUnlocalizedName("custom_fall").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":custom_fall");
battery_generic = new ItemBattery(50, 1, 1).setUnlocalizedName("battery_generic").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_generic");
battery_advanced = new ItemBattery(200, 5, 5).setUnlocalizedName("battery_advanced").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_advanced");
battery_generic = new ItemBattery(50, 1, 1).setUnlocalizedName("battery_generic").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_generic_new");
battery_advanced = new ItemBattery(200, 5, 5).setUnlocalizedName("battery_advanced").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_advanced_new");
battery_lithium = new ItemBattery(2500, 10, 10).setUnlocalizedName("battery_lithium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_lithium");
battery_schrabidium = new ItemBattery(10000, 50, 50).setUnlocalizedName("battery_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_schrabidium");
battery_schrabidium = new ItemBattery(10000, 50, 50).setUnlocalizedName("battery_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_schrabidium_new");
battery_spark = new ItemBattery(1000000, 20000, 20000).setUnlocalizedName("battery_spark").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark");
battery_creative = new Item().setUnlocalizedName("battery_creative").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_creative");
battery_creative = new Item().setUnlocalizedName("battery_creative").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_creative_new");
battery_red_cell = new ItemBattery(150, 1, 1).setUnlocalizedName("battery_red_cell").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_red_cell");
battery_red_cell_6 = new ItemBattery(150 * 6, 1, 1).setUnlocalizedName("battery_red_cell_6").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_red_cell_6");
@ -3119,6 +3130,9 @@ public class ModItems {
//Dusts & Other
GameRegistry.registerItem(lithium, lithium.getUnlocalizedName());
GameRegistry.registerItem(solid_fuel, solid_fuel.getUnlocalizedName());
GameRegistry.registerItem(coke, coke.getUnlocalizedName());
GameRegistry.registerItem(lignite, lignite.getUnlocalizedName());
GameRegistry.registerItem(briquette_lignite, briquette_lignite.getUnlocalizedName());
GameRegistry.registerItem(sulfur, sulfur.getUnlocalizedName());
GameRegistry.registerItem(niter, niter.getUnlocalizedName());
GameRegistry.registerItem(fluorite, fluorite.getUnlocalizedName());
@ -3148,6 +3162,7 @@ public class ModItems {
GameRegistry.registerItem(powder_magnetized_tungsten, powder_magnetized_tungsten.getUnlocalizedName());
GameRegistry.registerItem(powder_combine_steel, powder_combine_steel.getUnlocalizedName());
GameRegistry.registerItem(powder_lithium, powder_lithium.getUnlocalizedName());
GameRegistry.registerItem(powder_lignite, powder_lignite.getUnlocalizedName());
GameRegistry.registerItem(powder_iodine, powder_iodine.getUnlocalizedName());
GameRegistry.registerItem(powder_thorium, powder_thorium.getUnlocalizedName());
GameRegistry.registerItem(powder_neodymium, powder_neodymium.getUnlocalizedName());
@ -3438,6 +3453,7 @@ public class ModItems {
GameRegistry.registerItem(assembly_gold, assembly_gold.getUnlocalizedName());
GameRegistry.registerItem(assembly_schrabidium, assembly_schrabidium.getUnlocalizedName());
GameRegistry.registerItem(assembly_nightmare, assembly_nightmare.getUnlocalizedName());
GameRegistry.registerItem(assembly_desh, assembly_desh.getUnlocalizedName());
//GameRegistry.registerItem(assembly_pip, assembly_pip.getUnlocalizedName());
GameRegistry.registerItem(assembly_nopip, assembly_nopip.getUnlocalizedName());
GameRegistry.registerItem(assembly_smg, assembly_smg.getUnlocalizedName());

6
com/hbm/items/weapon/ItemAmmo.java
View File

@ -58,6 +58,12 @@ public class ItemAmmo extends Item {
list.add(EnumChatFormatting.BLUE + "+ Increased damage");
list.add(EnumChatFormatting.BLUE + "+ Withering");
}
//.357 MAGNUM
if(this == ModItems.ammo_357_desh) {
list.add(EnumChatFormatting.BLUE + "+ Fits every .357 model");
list.add(EnumChatFormatting.BLUE + "+ Above-average damage");
}
//.44 MAGNUM
if(this == ModItems.ammo_44_ap) {

2
com/hbm/items/weapon/ItemGunBase.java
View File

@ -243,6 +243,7 @@ public class ItemGunBase extends Item implements IHoldableWeapon {
setMag(stack, getMag(stack) + 1);
} else {
setIsReloading(stack, false);
world.playSoundAtEntity(player, mainConfig.reloadSound, 1.0F, 1.0F);
break;
}
}
@ -292,6 +293,7 @@ public class ItemGunBase extends Item implements IHoldableWeapon {
setMag(stack, getMag(stack) + 1);
} else {
setIsReloading(stack, false);
world.playSoundAtEntity(player, mainConfig.reloadSound, 1.0F, 1.0F);
break;
}
}

8
com/hbm/lib/HbmWorldGen.java
View File

@ -207,6 +207,14 @@ public class HbmWorldGen implements IWorldGenerator {
(new WorldGenMinable(ModBlocks.ore_rare, 5)).generate(world, rand, randPosX, randPosY, randPosZ);
}
for (int k = 0; k < MainRegistry.ligniteSpawn; k++) {
int randPosX = i + rand.nextInt(16);
int randPosY = rand.nextInt(25) + 35;
int randPosZ = j + rand.nextInt(16);
(new WorldGenMinable(ModBlocks.ore_lignite, 24)).generate(world, rand, randPosX, randPosY, randPosZ);
}
/*if (MainRegistry.enableBarrels && rand.nextInt(5) == 0) {
for (int k = 0; k < 1; k++) {
int randPosX = i + rand.nextInt(16);

21
com/hbm/main/CraftingManager.java
View File

@ -427,6 +427,9 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.biomass, 6), new Object[] { "logWood", "logWood", "logWood" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.biomass, 4), new Object[] { "plankWood", "plankWood", "plankWood", "plankWood", "plankWood", "plankWood", "plankWood", "plankWood", "plankWood" }));
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.biomass, 8), new Object[] { Blocks.hay_block, Blocks.hay_block });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.biomass, 1), new Object[] { Items.wheat_seeds, Items.wheat_seeds, Items.wheat_seeds, Items.wheat_seeds, Items.wheat_seeds, Items.wheat_seeds, Items.wheat_seeds, Items.wheat_seeds, Items.wheat_seeds });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.biomass, 2), new Object[] { Items.pumpkin_seeds, Items.pumpkin_seeds, Items.pumpkin_seeds, Items.pumpkin_seeds, Items.pumpkin_seeds, Items.pumpkin_seeds, Items.pumpkin_seeds, Items.pumpkin_seeds, Items.pumpkin_seeds });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.biomass, 2), new Object[] { Items.melon_seeds, Items.melon_seeds, Items.melon_seeds, Items.melon_seeds, Items.melon_seeds, Items.melon_seeds, Items.melon_seeds, Items.melon_seeds, Items.melon_seeds });
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_lithium), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustLithium" }));
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_beryllium), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustBeryllium" }));
@ -462,13 +465,14 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_copper, 1), new Object[] { "WWW", "WIW", "WWW", 'W', ModItems.wire_red_copper, 'I', "ingotIron" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_advanced_alloy, 1), new Object[] { "WWW", "WIW", "WWW", 'W', ModItems.wire_advanced_alloy, 'I', "ingotIron" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_gold, 1), new Object[] { "WWW", "WIW", "WWW", 'W', ModItems.wire_gold, 'I', "ingotIron" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_copper_torus, 2), new Object[] { "PCP", "C C", "PCP", 'P', "plateIron", 'C', ModItems.coil_copper }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_advanced_torus, 2), new Object[] { "PCP", "C C", "PCP", 'P', "plateIron", 'C', ModItems.coil_advanced_alloy }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_gold_torus, 2), new Object[] { "PCP", "C C", "PCP", 'P', "plateIron", 'C', ModItems.coil_gold }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_copper_torus, 2), new Object[] { " C ", "CPC", " C ", 'P', "plateIron", 'C', ModItems.coil_copper }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_advanced_torus, 2), new Object[] { " C ", "CPC", " C ", 'P', "plateIron", 'C', ModItems.coil_advanced_alloy }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_gold_torus, 2), new Object[] { " C ", "CPC", " C ", 'P', "plateIron", 'C', ModItems.coil_gold }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_tungsten, 1), new Object[] { "WWW", "WIW", "WWW", 'W', ModItems.wire_tungsten, 'I', "ingotIron" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_magnetized_tungsten, 1), new Object[] { "WWW", "WIW", "WWW", 'W', ModItems.wire_magnetized_tungsten, 'I', "ingotIron" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.tank_steel, 1), new Object[] { "STS", "S S", "STS", 'S', "plateSteel", 'T', "plateTitanium" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.motor, 1), new Object[] { " R ", "ICI", "ITI", 'R', ModItems.wire_red_copper, 'T', ModItems.coil_copper_torus, 'I', "plateIron", 'C', ModItems.coil_copper }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.motor, 2), new Object[] { " R ", "ICI", "ITI", 'R', ModItems.wire_red_copper, 'T', ModItems.coil_copper_torus, 'I', "plateIron", 'C', ModItems.coil_copper }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.motor, 2), new Object[] { " R ", "ICI", " T ", 'R', ModItems.wire_red_copper, 'T', ModItems.coil_copper_torus, 'I', "plateSteel", 'C', ModItems.coil_copper }));
//GameRegistry.addRecipe(new ItemStack(ModItems.centrifuge_element, 1), new Object[] { " T ", "WTW", "RMR", 'R', ModItems.wire_red_copper, 'T', ModItems.tank_steel, 'M', ModItems.motor, 'W', ModItems.coil_tungsten });
//GameRegistry.addRecipe(new ItemStack(ModItems.centrifuge_tower, 1), new Object[] { "LL", "EE", "EE", 'E', ModItems.centrifuge_element, 'L', new ItemStack(Items.dye, 1, 4) });
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.reactor_core, 1), new Object[] { "LNL", "N N", "LNL", 'N', "plateDenseLead", 'L', "plateLead" }));
@ -577,6 +581,7 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_nuke_furnace_off), 1), new Object[] { "SSS", "LFL", "CCC", 'S', "plateSteel", 'C', ModItems.board_copper, 'L', "plateLead", 'F', Item.getItemFromBlock(Blocks.furnace) }));
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_rtg_furnace_off), 1), new Object[] { "NNN", "NFN", "UUU", 'N', "plateDenseLead", 'U', ModItems.rtg_unit, 'F', Item.getItemFromBlock(Blocks.furnace) }));
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off), 1), new Object[] { "BBB", "WFW", "RRR", 'B', ModItems.ingot_beryllium, 'R', ModItems.coil_tungsten, 'W', ModItems.board_copper, 'F', Item.getItemFromBlock(Blocks.furnace) });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_arc_furnace_off, 1), new Object[] { "ITI", "PFP", "ITI", 'I', "ingotTungsten", 'T', ModBlocks.machine_transformer, 'P', ModItems.board_copper, 'F', Blocks.furnace }));
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_generator), 1), new Object[] { "SLS", "LCL", "SLS", 'C', ModItems.circuit_red_copper, 'L', ModItems.rod_quad_lead, 'S', "ingotSteel" }));
//GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_industrial_generator), 1), new Object[] { "PPP", "FGG", "WSS", 'P', ModItems.board_copper, 'F', ModItems.generator_front, 'G', ModItems.generator_steel, 'W', ModBlocks.red_wire_coated, 'S', ModItems.pedestal_steel });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.red_wire_coated), 16), new Object[] { "WRW", "RIR", "WRW", 'W', ModItems.plate_polymer, 'I', "ingotRedstoneAlloy", 'R', ModItems.wire_red_copper }));
@ -725,6 +730,7 @@ public class CraftingManager {
//GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.cmb_brick_reinforced), 8), new Object[] { "TBT", "BCB", "TBT", 'T', ModBlocks.block_magnetized_tungsten, 'B', ModBlocks.brick_concrete, 'C', ModBlocks.cmb_brick });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reinforced_brick), 8), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', ModBlocks.brick_concrete });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_compound), 8), new Object[] { "FBF", "BFB", "FBF", 'F', ModItems.bolt_tungsten, 'B', ModBlocks.reinforced_brick });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reinforced_glass), 8), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.glass });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reinforced_light), 1), new Object[] { "FFF", "FBF", "FFF", 'F', Blocks.iron_bars, 'B', Blocks.glowstone });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reinforced_lamp_off), 1), new Object[] { "FFF", "FBF", "FFF", 'F', Blocks.iron_bars, 'B', Blocks.redstone_lamp });
@ -756,6 +762,8 @@ public class CraftingManager {
public static void reg2() {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_rpg, 1), new Object[] { "SSW", " MW", 'S', ModItems.hull_small_steel, 'W', "plateIron", 'M', ModItems.mechanism_launcher_1 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_panzerschreck, 1), new Object[] { "SSS", " MW", 'S', ModItems.hull_small_steel, 'W', "plateCopper", 'M', ModItems.mechanism_launcher_1 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_karl, 1), new Object[] { "SSW", " MW", 'S', ModItems.hull_small_steel, 'W', "plateAdvanced", 'M', ModItems.mechanism_launcher_2 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_hk69, 1), new Object[] { "SSI", " MB", 'S', ModItems.hull_small_steel, 'I', "ingotIron", 'M', ModItems.mechanism_launcher_1, 'B', ModItems.bolt_tungsten }));
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_rpg_ammo, 8), new Object[] { "SI ", "ITI", " I ", 'S', "plateSteel", 'T', Item.getItemFromBlock(Blocks.tnt), 'I', "plateIron", 'M', ModItems.mechanism_launcher_2 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_stinger, 1), new Object[] { "SSW", "CMW", 'S', "plateSteel", 'W', "plateTitanium", 'C', ModItems.circuit_red_copper, 'M', ModItems.mechanism_launcher_2 }));
@ -863,6 +871,7 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_gold, 16), new Object[] { " I", "GC", " P", 'I', "ingotGold", 'G', ModItems.cordite, 'C', ModItems.casing_357, 'P', ModItems.primer_357 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_schrabidium, 16), new Object[] { " I ", "GCN", " P ", 'I', "ingotSchrabidium", 'G', ModItems.cordite, 'C', ModItems.casing_357, 'P', ModItems.primer_357, 'N', Items.nether_star }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_nightmare, 16), new Object[] { " I", "GC", " P", 'I', "ingotTungsten", 'G', ModItems.cordite, 'C', ModItems.casing_357, 'P', ModItems.primer_357 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_desh, 16), new Object[] { " I", "GC", " P", 'I', "ingotDesh", 'G', ModItems.cordite, 'C', ModItems.casing_357, 'P', ModItems.primer_357 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_smg, 24), new Object[] { " I", "GC", " P", 'I', "ingotLead", 'G', ModItems.cordite, 'C', ModItems.casing_9, 'P', ModItems.primer_9 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_uzi, 24), new Object[] { " I", "GC", " P", 'I', "ingotIron", 'G', ModItems.cordite, 'C', ModItems.casing_9, 'P', ModItems.primer_9 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_lacunae, 24), new Object[] { " I", "GC", " P", 'I', "ingotCopper", 'G', ModItems.cordite, 'C', ModItems.casing_9, 'P', ModItems.primer_9 }));
@ -1511,6 +1520,7 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.absorber_green, 1), new Object[] { "ICI", "CPC", "ICI", 'I', "ingotPolymer", 'C', ModItems.powder_desh_mix, 'P', ModBlocks.absorber_red }));
GameRegistry.addRecipe(new ItemStack(ModBlocks.absorber_pink, 1), new Object[] { "ICI", "CPC", "ICI", 'I', ModItems.ingot_saturnite, 'C', ModItems.powder_nitan_mix, 'P', ModBlocks.absorber_green });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.decon, 1), new Object[] { "BGB", "SAS", "BSB", 'B', "ingotBeryllium", 'G', Blocks.iron_bars, 'S', "ingotSteel", 'A', ModBlocks.absorber }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_amgen, 1), new Object[] { "ITI", "TAT", "ITI", 'I', "ingotAdvanced", 'T', ModItems.thermo_element, 'A', ModBlocks.absorber }));
GameRegistry.addShapelessRecipe(new ItemStack(Items.paper, 1), new Object[] { new ItemStack(ModItems.assembly_template, 1, OreDictionary.WILDCARD_VALUE) });
GameRegistry.addShapelessRecipe(new ItemStack(Items.paper, 1), new Object[] { new ItemStack(ModItems.chemistry_template, 1, OreDictionary.WILDCARD_VALUE) });
@ -1591,6 +1601,9 @@ public class CraftingManager {
GameRegistry.addSmelting(ModItems.powder_actinium, new ItemStack(ModItems.ingot_actinium), 1.0F);
GameRegistry.addSmelting(ModItems.powder_desh, new ItemStack(ModItems.ingot_desh), 1.0F);
GameRegistry.addSmelting(ModItems.powder_coal, new ItemStack(ModItems.coke), 1.0F);
GameRegistry.addSmelting(ModItems.briquette_lignite, new ItemStack(ModItems.coke), 1.0F);
GameRegistry.addSmelting(ModItems.combine_scrap, new ItemStack(ModItems.ingot_combine_steel), 1.0F);
GameRegistry.addSmelting(ModItems.tank_waste, new ItemStack(ModItems.tank_waste), 0.0F);
//GameRegistry.addSmelting(ModItems.canister_smear, new ItemStack(ModItems.canister_reoil), 1.0F);

7
com/hbm/main/MainRegistry.java
View File

@ -523,6 +523,7 @@ public class MainRegistry
public static int tungstenSpawn = 10;
public static int leadSpawn = 6;
public static int berylliumSpawn = 6;
public static int ligniteSpawn = 2;
public static int gadgetRadius = 150;
public static int boyRadius = 120;
@ -1385,6 +1386,7 @@ public class MainRegistry
OreDictionary.registerOre("dustEmerald", ModItems.powder_emerald);
OreDictionary.registerOre("dustLapis", ModItems.powder_lapis);
OreDictionary.registerOre("dustCoal", ModItems.powder_coal);
OreDictionary.registerOre("dustLignite", ModItems.powder_lignite);
OreDictionary.registerOre("dustAdvanced", ModItems.powder_advanced_alloy);
OreDictionary.registerOre("dustAdvancedAlloy", ModItems.powder_advanced_alloy);
OreDictionary.registerOre("dustCMBSteel", ModItems.powder_combine_steel);
@ -1429,6 +1431,7 @@ public class MainRegistry
OreDictionary.registerOre("nuggetActinium", ModItems.fragment_actinium);
OreDictionary.registerOre("gemCoal", Items.coal);
OreDictionary.registerOre("gemLignite", ModItems.lignite);
OreDictionary.registerOre("oreUranium", ModBlocks.ore_uranium);
OreDictionary.registerOre("oreThorium", ModBlocks.ore_thorium);
@ -1443,6 +1446,7 @@ public class MainRegistry
OreDictionary.registerOre("oreFluorite", ModBlocks.ore_fluorite);
OreDictionary.registerOre("oreLead", ModBlocks.ore_lead);
OreDictionary.registerOre("oreBeryllium", ModBlocks.ore_beryllium);
OreDictionary.registerOre("oreLignite", ModBlocks.ore_lignite);
OreDictionary.registerOre("oreAustralium", ModBlocks.ore_australium);
OreDictionary.registerOre("oreWeidanium", ModBlocks.ore_weidanium);
OreDictionary.registerOre("oreReiium", ModBlocks.ore_reiium);
@ -1776,6 +1780,9 @@ public class MainRegistry
Property PthoriumSpawn = config.get(CATEGORY_OREGEN, "2.10_thoriumSpawnrate", 7);
PthoriumSpawn.comment = "Ammount of thorium ore veins per chunk";
thoriumSpawn = PthoriumSpawn.getInt();
Property ligniteSpawnP = config.get(CATEGORY_OREGEN, "2.11_ligniteSpawnrate", 2);
ligniteSpawnP.comment = "Ammount of lignite ore veins per chunk";
ligniteSpawn = ligniteSpawnP.getInt();
final String CATEGORY_NUKES = "03_nukes";
Property propGadget = config.get(CATEGORY_NUKES, "3.00_gadgetRadius", 150);

4
com/hbm/packet/ParticleBurstPacket.java
View File

@ -56,7 +56,9 @@ public class ParticleBurstPacket implements IMessage {
@Override
public IMessage onMessage(ParticleBurstPacket m, MessageContext ctx) {
Minecraft.getMinecraft().effectRenderer.addBlockDestroyEffects(m.x, m.y, m.z, Block.getBlockById(m.block), m.meta);
try {
Minecraft.getMinecraft().effectRenderer.addBlockDestroyEffects(m.x, m.y, m.z, Block.getBlockById(m.block), m.meta);
} catch(Exception x) { }
return null;
}

32
com/hbm/tileentity/machine/TileEntityDiFurnace.java
View File

@ -20,8 +20,8 @@ public class TileEntityDiFurnace extends TileEntity implements ISidedInventory {
public int dualCookTime;
public int dualPower;
public static final int maxPower = 100000;
public static final int processingSpeed = 100;
public static final int maxPower = 12800;
public static final int processingSpeed = 400;
private static final int[] slots_top = new int[] {0};
private static final int[] slots_bottom = new int[] {3};
@ -118,18 +118,20 @@ public class TileEntityDiFurnace extends TileEntity implements ISidedInventory {
{
return 0;
}else{
Item item = itemStack.getItem();
if(item == Items.coal) return 2500;
if(item == Item.getItemFromBlock(Blocks.coal_block)) return 25000;
if(item == Items.lava_bucket) return 50000;
if(item == Items.redstone) return 1000;
if(item == Item.getItemFromBlock(Blocks.redstone_block)) return 10000;
if(item == Item.getItemFromBlock(Blocks.netherrack)) return 1750;
if(item == Items.blaze_rod) return 15000;
if(item == Items.blaze_powder) return 5000;
return 0;
Item item = itemStack.getItem();
if(item == Items.coal) return 200;
if(item == Item.getItemFromBlock(Blocks.coal_block)) return 2000;
if(item == Items.lava_bucket) return 12800;
if(item == Items.blaze_rod) return 1000;
if(item == Items.blaze_powder) return 300;
if(item == ModItems.lignite) return 150;
if(item == ModItems.powder_lignite) return 150;
if(item == ModItems.powder_coal) return 200;
if(item == ModItems.briquette_lignite) return 200;
if(item == ModItems.coke) return 400;
return 0;
}
}
@ -288,7 +290,7 @@ public class TileEntityDiFurnace extends TileEntity implements ISidedInventory {
if(hasPower() && isProcessing())
{
this.dualPower = this.dualPower - 50;
this.dualPower = this.dualPower - 1;
if(this.dualPower < 0)
{

4
com/hbm/tileentity/machine/TileEntityMachineArcFurnace.java
View File

@ -24,7 +24,7 @@ public class TileEntityMachineArcFurnace extends TileEntity implements ISidedInv
public int dualCookTime;
public long power;
public static final long maxPower = 100000;
public static final long maxPower = 50000;
public static final int processingSpeed = 20;
//0: i
@ -323,7 +323,7 @@ public class TileEntityMachineArcFurnace extends TileEntity implements ISidedInv
{
dualCookTime++;
power -= 1000;
power -= 250;
if(this.dualCookTime == processingSpeed)
{

8
com/hbm/tileentity/machine/TileEntityMachineShredder.java
View File

@ -249,12 +249,12 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven
{
flag1 = true;
}
power = Library.chargeTEFromItems(slots, 29, power, maxPower);
PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power));
}
power = Library.chargeTEFromItems(slots, 29, power, maxPower);
PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power));
if(flag1)
{
this.markDirty();