diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index d6022d022..afe2c497b 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -1882,12 +1882,12 @@ public class ModBlocks { cable_detector = new CableDetector(Material.iron).setBlockName("cable_detector").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); cable_diode = new CableDiode(Material.iron).setBlockName("cable_diode").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":cable_diode"); machine_detector = new PowerDetector(Material.iron).setBlockName("machine_detector").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_detector_off"); - oil_duct_solid = new OilDuctSolid(Material.iron).setBlockName("oil_duct_solid").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":oil_duct_solid_alt"); + oil_duct_solid = new OilDuctSolid(Material.iron).setBlockName("oil_duct_solid").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":oil_duct_solid_alt"); oil_duct = new BlockOilDuct(Material.iron).setBlockName("oil_duct").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":oil_duct_icon_alt"); gas_duct_solid = new GasDuctSolid(Material.iron).setBlockName("gas_duct_solid").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":gas_duct_solid"); gas_duct = new BlockGasDuct(Material.iron).setBlockName("gas_duct").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":gas_duct_icon"); fluid_duct = new BlockFluidDuct(Material.iron).setBlockName("fluid_duct").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":fluid_duct_icon"); - fluid_duct_solid = new BlockFluidDuctSolid(Material.iron).setBlockName("fluid_duct_solid").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fluid_duct_solid"); + fluid_duct_solid = new BlockFluidDuctSolid(Material.iron).setBlockName("fluid_duct_solid").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":fluid_duct_solid"); fluid_duct_neo = new FluidDuctStandard(Material.iron).setBlockName("fluid_duct_neo").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pipe_neo"); fluid_duct_box = new FluidDuctBox(Material.iron).setBlockName("fluid_duct_box").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fluid_duct_box"); fluid_duct_paintable = new FluidDuctPaintable().setBlockName("fluid_duct_paintable").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); diff --git a/src/main/java/com/hbm/handler/nei/ShredderRecipeHandler.java b/src/main/java/com/hbm/handler/nei/ShredderRecipeHandler.java index 31b5296b0..396109047 100644 --- a/src/main/java/com/hbm/handler/nei/ShredderRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/ShredderRecipeHandler.java @@ -112,7 +112,7 @@ public class ShredderRecipeHandler extends TemplateRecipeHandler { public void loadUsageRecipes(ItemStack ingredient) { Map recipes = ShredderRecipes.getShredderRecipes(); for(Map.Entry recipe : recipes.entrySet()) { - if(NEIServerUtils.areStacksSameType(ingredient, ((ComparableStack) recipe.getKey()).toStack())) + if(NEIServerUtils.areStacksSameTypeCrafting(ingredient, ((ComparableStack) recipe.getKey()).toStack())) this.arecipes.add(new SmeltingSet(((ComparableStack) recipe.getKey()).toStack(), (ItemStack) recipe.getValue())); } } diff --git a/src/main/java/com/hbm/inventory/fluid/Fluids.java b/src/main/java/com/hbm/inventory/fluid/Fluids.java index 459ca6658..9a10f940d 100644 --- a/src/main/java/com/hbm/inventory/fluid/Fluids.java +++ b/src/main/java/com/hbm/inventory/fluid/Fluids.java @@ -102,7 +102,7 @@ public class Fluids { public static FluidType BLOOD_HOT; public static FluidType SYNGAS; public static FluidType OXYHYDROGEN; - public static FluidType RADIOSOLVENT; + public static FluidType RADIOSOLVENT; //DCM-ish made by wacky radio cracking public static FluidType CHLORINE; //everone's favorite! public static FluidType HEAVYOIL_VACUUM; public static FluidType REFORMATE; @@ -114,6 +114,9 @@ public class Fluids { public static FluidType DIESEL_CRACK_REFORM; public static FluidType KEROSENE_REFORM; public static FluidType REFORMGAS; //MAPD: propyne, propadiene + public static FluidType COLLOID; + public static FluidType PHOSGENE; + public static FluidType MUSTARDGAS; private static final HashMap idMapping = new HashMap(); private static final HashMap nameMapping = new HashMap(); @@ -233,17 +236,20 @@ public class Fluids { SYNGAS = new FluidType("SYNGAS", 0x131313, 1, 4, 2, EnumSymbol.NONE).addTraits(GASEOUS); OXYHYDROGEN = new FluidType("OXYHYDROGEN", 0x483FC1, 0, 4, 2, EnumSymbol.NONE).addTraits(GASEOUS); RADIOSOLVENT = new FluidType("RADIOSOLVENT", 0xA4D7DD, 3, 3, 0, EnumSymbol.NONE).addTraits(LIQUID, LEADCON, new FT_Corrosive(50), new FT_VentRadiation(0.01F)); - CHLORINE = new FluidType("CHLORINE", 0xBAB572, 4, 0, 0, EnumSymbol.OXIDIZER).addTraits(GASEOUS, new FT_Corrosive(25), new FT_Poison(true, 1)); + CHLORINE = new FluidType("CHLORINE", 0xBAB572, 3, 0, 0, EnumSymbol.OXIDIZER).addTraits(GASEOUS, new FT_Corrosive(25), new FT_Poison(true, 1)); HEAVYOIL_VACUUM = new FluidType("HEAVYOIL_VACUUM", 0x131214, 2, 1, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(0x513F39, ExtContainer.CANISTER); REFORMATE = new FluidType("REFORMATE", 0x835472, 2, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(0xD180D6, ExtContainer.CANISTER); LIGHTOIL_VACUUM = new FluidType("LIGHTOIL_VACUUM", 0x8C8851, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(0xB46B52, ExtContainer.CANISTER); - SOURGAS = new FluidType("SOURGAS", 0xC9BE0D, 4, 4, 0, EnumSymbol.ACID).addTraits(GASEOUS, new FT_Corrosive(10)); + SOURGAS = new FluidType("SOURGAS", 0xC9BE0D, 4, 4, 0, EnumSymbol.ACID).addTraits(GASEOUS, new FT_Corrosive(10), new FT_Poison(false, 1)); XYLENE = new FluidType("XYLENE", 0x5C4E76, 2, 3, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(0xA380D6, ExtContainer.CANISTER); HEATINGOIL_VACUUM = new FluidType("HEATINGOIL_VACUUM", 0x211D06, 2, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(0x694235, ExtContainer.CANISTER); DIESEL_REFORM = new FluidType("DIESEL_REFORM", 0xCDC3C6, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(0xFFC500, ExtContainer.CANISTER); DIESEL_CRACK_REFORM = new FluidType("DIESEL_CRACK_REFORM",0xCDC3CC, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(0xFFC500, ExtContainer.CANISTER); KEROSENE_REFORM = new FluidType("KEROSENE_REFORM", 0xFFA5F3, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(0xFF377D, ExtContainer.CANISTER); - REFORMGAS = new FluidType(99, "REFORMGAS", 0x6362AE, 1, 4, 1, EnumSymbol.NONE).addTraits(GASEOUS); + REFORMGAS = new FluidType("REFORMGAS", 0x6362AE, 1, 4, 1, EnumSymbol.NONE).addTraits(GASEOUS); + COLLOID = new FluidType("COLLOID", 0x787878, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID); + PHOSGENE = new FluidType("PHOSGENE", 0xCFC4A4, 4, 0, 1, EnumSymbol.NONE).addTraits(GASEOUS); + MUSTARDGAS = new FluidType(102, "MUSTARDGAS", 0xBAB572, 4, 1, 1, EnumSymbol.NONE).addTraits(GASEOUS); // ^ ^ ^ ^ ^ ^ ^ ^ @@ -333,6 +339,7 @@ public class Fluids { //processing fluids metaOrder.add(SALIENT); metaOrder.add(SEEDSLURRY); + metaOrder.add(COLLOID); metaOrder.add(ACID); metaOrder.add(SULFURIC_ACID); metaOrder.add(NITRIC_ACID); @@ -347,6 +354,9 @@ public class Fluids { metaOrder.add(WATZ); //solutions and working fluids metaOrder.add(FRACKSOL); + //the fun guys + metaOrder.add(PHOSGENE); + metaOrder.add(MUSTARDGAS); //antimatter metaOrder.add(AMAT); metaOrder.add(ASCHRAB); diff --git a/src/main/java/com/hbm/inventory/material/Mats.java b/src/main/java/com/hbm/inventory/material/Mats.java index 05f606da3..727d1b405 100644 --- a/src/main/java/com/hbm/inventory/material/Mats.java +++ b/src/main/java/com/hbm/inventory/material/Mats.java @@ -31,7 +31,6 @@ public class Mats { public static HashMap prefixByName = new HashMap(); public static HashMap matById = new HashMap(); public static HashMap matByName = new HashMap(); - //public static HashMap matRemap = new HashMap(); public static HashMap> materialEntries = new HashMap(); public static HashMap> materialOreEntries = new HashMap(); diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index 93639aaa1..086d40f87 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -31,6 +31,7 @@ import com.hbm.items.ModItems; import com.hbm.items.machine.ItemAssemblyTemplate; import com.hbm.items.machine.ItemDrillbit.EnumDrillType; import com.hbm.items.machine.ItemPistons.EnumPistonType; +import com.hbm.items.weapon.ItemAmmoHIMARS; import com.hbm.main.MainRegistry; import cpw.mods.fml.common.Loader; @@ -815,22 +816,62 @@ public class AssemblerRecipes { new ComparableStack(ModItems.crt_display, 1) }, 300); - makeRecipe(new ComparableStack(ModItems.ammo_himars, 1, 0), new AStack[] { + makeRecipe(new ComparableStack(ModItems.ammo_himars, 1, ItemAmmoHIMARS.SMALL), new AStack[] { new OreDictStack(STEEL.plate(), 24), new OreDictStack(ANY_PLASTIC.ingot(), 12), - new OreDictStack(ANY_SMOKELESS.dust(), 48), - new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 6), - new ComparableStack(ModItems.circuit_copper, 6), - new ComparableStack(ModItems.wire_gold, 12) + new ComparableStack(ModItems.rocket_fuel, 48), + new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 48), + new ComparableStack(ModItems.circuit_copper, 12) }, 100); - - makeRecipe(new ComparableStack(ModItems.ammo_himars, 1, 1), new AStack[] { + makeRecipe(new ComparableStack(ModItems.ammo_himars, 1, ItemAmmoHIMARS.SMALL_HE), new AStack[] { new OreDictStack(STEEL.plate(), 24), - new OreDictStack(ANY_PLASTIC.ingot(), 6), - new OreDictStack(ANY_SMOKELESS.dust(), 36), - new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 4), - new ComparableStack(ModItems.circuit_red_copper, 2), - new ComparableStack(ModItems.wire_gold, 8) + new OreDictStack(ANY_PLASTIC.ingot(), 24), + new ComparableStack(ModItems.rocket_fuel, 48), + new OreDictStack(ANY_PLASTICEXPLOSIVE.ingot(), 18), + new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 48), + new ComparableStack(ModItems.circuit_copper, 12) + }, 100); + makeRecipe(new ComparableStack(ModItems.ammo_himars, 1, ItemAmmoHIMARS.SMALL_WP), new AStack[] { + new OreDictStack(STEEL.plate(), 24), + new OreDictStack(ANY_PLASTIC.ingot(), 24), + new ComparableStack(ModItems.rocket_fuel, 48), + new OreDictStack(P_WHITE.ingot(), 18), + new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 48), + new ComparableStack(ModItems.circuit_copper, 12) + }, 100); + makeRecipe(new ComparableStack(ModItems.ammo_himars, 1, ItemAmmoHIMARS.SMALL_TB), new AStack[] { + new OreDictStack(STEEL.plate(), 24), + new OreDictStack(ANY_PLASTIC.ingot(), 24), + new ComparableStack(ModItems.rocket_fuel, 48), + new ComparableStack(ModItems.ball_tatb, 32), + new OreDictStack(Fluids.KEROSENE_REFORM.getDict(1_000), 12), + new OreDictStack(Fluids.ACID.getDict(1_000), 12), + new ComparableStack(ModItems.circuit_copper, 12) + }, 100); + makeRecipe(new ComparableStack(ModItems.ammo_himars, 1, ItemAmmoHIMARS.SMALL_MINI_NUKE), new AStack[] { + new OreDictStack(STEEL.plate(), 24), + new OreDictStack(ANY_PLASTIC.ingot(), 24), + new ComparableStack(ModItems.rocket_fuel, 48), + new ComparableStack(ModItems.ball_tatb, 6), + new OreDictStack(PU239.nugget(), 12), + new OreDictStack(OreDictManager.getReflector(), 12), + new ComparableStack(ModItems.circuit_copper, 12) + }, 100); + makeRecipe(new ComparableStack(ModItems.ammo_himars, 1, ItemAmmoHIMARS.LARGE), new AStack[] { + new OreDictStack(STEEL.plate(), 24), + new OreDictStack(ANY_HARDPLASTIC.ingot(), 12), + new ComparableStack(ModItems.rocket_fuel, 36), + new ComparableStack(ModItems.ball_tatb, 16), + new ComparableStack(ModItems.circuit_gold, 2), + }, 100); + makeRecipe(new ComparableStack(ModItems.ammo_himars, 1, ItemAmmoHIMARS.LARGE_TB), new AStack[] { + new OreDictStack(STEEL.plate(), 24), + new OreDictStack(ANY_HARDPLASTIC.ingot(), 12), + new ComparableStack(ModItems.rocket_fuel, 36), + new ComparableStack(ModItems.ball_tatb, 24), + new OreDictStack(Fluids.KEROSENE_REFORM.getDict(1_000), 16), + new OreDictStack(Fluids.ACID.getDict(1_000), 16), + new ComparableStack(ModItems.circuit_gold, 2), }, 100); makeRecipe(new ComparableStack(ModBlocks.machine_silex, 1), new AStack[] { @@ -843,7 +884,6 @@ public class AssemblerRecipes { new ComparableStack(ModItems.pipes_steel, 1), new ComparableStack(ModItems.crystal_diamond, 1) }, 400); - makeRecipe(new ComparableStack(Item.getItemFromBlock(ModBlocks.machine_fel), 1), new AStack[] { new ComparableStack(ModBlocks.fusion_conductor, 16), new ComparableStack(ModBlocks.machine_lithium_battery, 2), @@ -854,7 +894,7 @@ public class AssemblerRecipes { new ComparableStack(ModItems.wire_red_copper, 64), new ComparableStack(ModItems.coil_advanced_torus, 16), new ComparableStack(ModItems.circuit_gold, 1) - }, 400); + }, 400); makeRecipe(new ComparableStack(ModBlocks.rbmk_blank, 1), new AStack[] { new ComparableStack(ModBlocks.concrete_asbestos, 4), diff --git a/src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java b/src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java index 577e98bdd..bc358061b 100644 --- a/src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java @@ -133,6 +133,8 @@ public class CrystallizerRecipes extends SerializableRecipe { registerRecipe(new ComparableStack(DictFrame.fromOne(ModItems.oil_tar, EnumTarType.CRUDE)), new CrystallizerRecipe(DictFrame.fromOne(ModItems.oil_tar, EnumTarType.WAX), 20), new FluidStack(Fluids.CHLORINE, 250)); registerRecipe(new ComparableStack(DictFrame.fromOne(ModItems.oil_tar, EnumTarType.CRACK)), new CrystallizerRecipe(DictFrame.fromOne(ModItems.oil_tar, EnumTarType.WAX), 20), new FluidStack(Fluids.CHLORINE, 100)); + registerRecipe(KEY_SAND, new CrystallizerRecipe(Blocks.clay, 20), new FluidStack(Fluids.COLLOID, 1_000)); + List quartz = OreDictionary.getOres("crystalCertusQuartz"); if(quartz != null && !quartz.isEmpty()) { diff --git a/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java b/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java index 608e6f39e..8844cd417 100644 --- a/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java @@ -1,6 +1,6 @@ package com.hbm.inventory.recipes; -import static com.hbm.inventory.OreDictManager.KNO; +import static com.hbm.inventory.OreDictManager.*; import java.io.IOException; import java.util.ArrayList; @@ -31,13 +31,16 @@ public class MixerRecipes extends SerializableRecipe { recipes.put(Fluids.COOLANT, new MixerRecipe(2_000, 50).setStack1(new FluidStack(Fluids.WATER, 1_800)).setSolid(new OreDictStack(KNO.dust()))); recipes.put(Fluids.CRYOGEL, new MixerRecipe(2_000, 50).setStack1(new FluidStack(Fluids.COOLANT, 1_800)).setSolid(new ComparableStack(ModItems.powder_ice))); recipes.put(Fluids.NITAN, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.KEROSENE, 600)).setStack2(new FluidStack(Fluids.MERCURY, 200)).setSolid(new ComparableStack(ModItems.powder_nitan_mix))); - recipes.put(Fluids.FRACKSOL, new MixerRecipe(1_000, 20).setStack1(new FluidStack(Fluids.WATER, 1_000)).setStack2(new FluidStack(Fluids.PETROLEUM, 100)).setSolid(new OreDictStack(OreDictManager.S.dust()))); - recipes.put(Fluids.ENDERJUICE, new MixerRecipe(100, 100).setStack1(new FluidStack(Fluids.XPJUICE, 500)).setSolid(new OreDictStack(OreDictManager.DIAMOND.dust()))); + recipes.put(Fluids.FRACKSOL, new MixerRecipe(1_000, 20).setStack1(new FluidStack(Fluids.WATER, 1_000)).setStack2(new FluidStack(Fluids.PETROLEUM, 100)).setSolid(new OreDictStack(S.dust()))); + recipes.put(Fluids.ENDERJUICE, new MixerRecipe(100, 100).setStack1(new FluidStack(Fluids.XPJUICE, 500)).setSolid(new OreDictStack(DIAMOND.dust()))); recipes.put(Fluids.SALIENT, new MixerRecipe(1000, 20).setStack1(new FluidStack(Fluids.SEEDSLURRY, 500)).setStack2(new FluidStack(Fluids.BLOOD, 500))); + recipes.put(Fluids.COLLOID, new MixerRecipe(500, 20).setStack1(new FluidStack(Fluids.WATER, 500)).setSolid(new ComparableStack(ModItems.dust))); + recipes.put(Fluids.PHOSGENE, new MixerRecipe(1000, 20).setStack1(new FluidStack(Fluids.UNSATURATEDS, 500)).setStack2(new FluidStack(Fluids.CHLORINE, 500))); + recipes.put(Fluids.MUSTARDGAS, new MixerRecipe(1000, 20).setStack1(new FluidStack(Fluids.REFORMGAS, 750)).setStack2(new FluidStack(Fluids.CHLORINE, 250)).setSolid(new OreDictStack(S.dust()))); recipes.put(Fluids.SOLVENT, new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500))); - recipes.put(Fluids.SULFURIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.ACID, 800)).setSolid(new OreDictStack(OreDictManager.S.dust()))); - recipes.put(Fluids.NITRIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.SULFURIC_ACID, 500)).setSolid(new OreDictStack(OreDictManager.KNO.dust()))); + recipes.put(Fluids.SULFURIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.ACID, 800)).setSolid(new OreDictStack(S.dust()))); + recipes.put(Fluids.NITRIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.SULFURIC_ACID, 500)).setSolid(new OreDictStack(KNO.dust()))); recipes.put(Fluids.SCHRABIDIC, new MixerRecipe(16_000, 100).setStack1(new FluidStack(Fluids.SAS3, 8_000)).setStack2(new FluidStack(Fluids.ACID, 6_000)).setSolid(new ComparableStack(ModItems.pellet_charged))); recipes.put(Fluids.LUBRICANT, new MixerRecipe(1_000, 20).setStack1(new FluidStack(Fluids.HEATINGOIL, 500)).setStack2(new FluidStack(Fluids.UNSATURATEDS, 500))); diff --git a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java index b9830f277..f93b75585 100644 --- a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java @@ -166,7 +166,7 @@ public class ShredderRecipes extends SerializableRecipe { ShredderRecipes.setRecipe(Blocks.sandstone_stairs, new ItemStack(Blocks.sand, 6)); ShredderRecipes.setRecipe(Blocks.clay, new ItemStack(Items.clay_ball, 4)); ShredderRecipes.setRecipe(Blocks.hardened_clay, new ItemStack(Items.clay_ball, 4)); - ShredderRecipes.setRecipe(Blocks.tnt, new ItemStack(Items.gunpowder, 5)); + ShredderRecipes.setRecipe(Blocks.tnt, new ItemStack(Items.gunpowder, Compat.isModLoaded(Compat.MOD_GT6) ? 4 : 5)); ShredderRecipes.setRecipe(ModBlocks.stone_gneiss, new ItemStack(ModItems.powder_lithium_tiny, 1)); ShredderRecipes.setRecipe(ModItems.powder_lapis, new ItemStack(ModItems.powder_cobalt_tiny, 1)); ShredderRecipes.setRecipe(ModItems.fragment_neodymium, new ItemStack(ModItems.powder_neodymium_tiny, 1)); diff --git a/src/main/java/com/hbm/items/weapon/ItemAmmoHIMARS.java b/src/main/java/com/hbm/items/weapon/ItemAmmoHIMARS.java index e096d01bc..9d2b1dba1 100644 --- a/src/main/java/com/hbm/items/weapon/ItemAmmoHIMARS.java +++ b/src/main/java/com/hbm/items/weapon/ItemAmmoHIMARS.java @@ -39,13 +39,13 @@ public class ItemAmmoHIMARS extends Item { public static HIMARSRocket[] itemTypes = new HIMARSRocket[ /* >>> */ 7 /* <<< */ ]; - public final int SMALL = 0; - public final int LARGE = 1; - public final int SMALL_HE = 2; - public final int SMALL_WP = 3; - public final int SMALL_TB = 4; - public final int LARGE_TB = 5; - public final int SMALL_MINI_NUKE = 6; + public static final int SMALL = 0; + public static final int LARGE = 1; + public static final int SMALL_HE = 2; + public static final int SMALL_WP = 3; + public static final int SMALL_TB = 4; + public static final int LARGE_TB = 5; + public static final int SMALL_MINI_NUKE = 6; public ItemAmmoHIMARS() { this.setHasSubtypes(true); diff --git a/src/main/java/com/hbm/tileentity/conductor/TileEntityFluidDuctSimple.java b/src/main/java/com/hbm/tileentity/conductor/TileEntityFluidDuctSimple.java index f9b896b0d..60e93c1fd 100644 --- a/src/main/java/com/hbm/tileentity/conductor/TileEntityFluidDuctSimple.java +++ b/src/main/java/com/hbm/tileentity/conductor/TileEntityFluidDuctSimple.java @@ -3,11 +3,13 @@ package com.hbm.tileentity.conductor; import java.util.ArrayList; import java.util.List; +import com.hbm.blocks.ModBlocks; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids; import com.hbm.interfaces.IFluidDuct; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.lib.Library; +import com.hbm.tileentity.network.TileEntityPipeBaseNT; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; @@ -73,11 +75,19 @@ public class TileEntityFluidDuctSimple extends TileEntity implements IFluidDuct @Override public void updateEntity() { - this.updateConnections(); + /*this.updateConnections(); if(lastType != type) { worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); lastType = type; + }*/ + + if(this.getBlockType() == ModBlocks.fluid_duct) worldObj.setBlock(xCoord, yCoord, zCoord, ModBlocks.fluid_duct_neo); + if(this.getBlockType() == ModBlocks.fluid_duct_solid) worldObj.setBlock(xCoord, yCoord, zCoord, ModBlocks.fluid_duct_paintable); + + TileEntity tile = worldObj.getTileEntity(xCoord, yCoord, zCoord); + if(tile instanceof TileEntityPipeBaseNT) { + ((TileEntityPipeBaseNT) tile).setType(this.type); } } diff --git a/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuct.java b/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuct.java index 48f619f1c..bcc06b8a4 100644 --- a/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuct.java +++ b/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuct.java @@ -3,11 +3,13 @@ package com.hbm.tileentity.conductor; import java.util.ArrayList; import java.util.List; +import com.hbm.blocks.ModBlocks; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids; import com.hbm.interfaces.IFluidDuct; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.lib.Library; +import com.hbm.tileentity.network.TileEntityPipeBaseNT; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -20,10 +22,18 @@ public class TileEntityGasDuct extends TileEntity implements IFluidDuct { public ForgeDirection[] connections = new ForgeDirection[6]; public FluidType type = Fluids.GAS; public List uoteab = new ArrayList(); - + @Override public void updateEntity() { - this.updateConnections(); + + //this.updateConnections(); + + worldObj.setBlock(xCoord, yCoord, zCoord, ModBlocks.fluid_duct_neo, 1, 3); + + TileEntity tile = worldObj.getTileEntity(xCoord, yCoord, zCoord); + if(tile instanceof TileEntityPipeBaseNT) { + ((TileEntityPipeBaseNT) tile).setType(this.type); + } } public void updateConnections() { diff --git a/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java b/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java index 760612a1e..a78c2a6e3 100644 --- a/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java +++ b/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java @@ -3,10 +3,12 @@ package com.hbm.tileentity.conductor; import java.util.ArrayList; import java.util.List; +import com.hbm.blocks.ModBlocks; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids; import com.hbm.interfaces.IFluidDuct; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; +import com.hbm.tileentity.network.TileEntityPipeBaseNT; import net.minecraft.tileentity.TileEntity; @@ -14,6 +16,22 @@ public class TileEntityGasDuctSolid extends TileEntity implements IFluidDuct { public FluidType type = Fluids.GAS; public List uoteab = new ArrayList(); + + @Override + public void updateEntity() { + + //if(!worldObj.isRemote) + // PacketDispatcher.wrapper.sendToAll(new TEFluidPipePacket(xCoord, yCoord, zCoord, type)); + + //this.updateConnections(); + + worldObj.setBlock(xCoord, yCoord, zCoord, ModBlocks.fluid_duct_paintable); + + TileEntity tile = worldObj.getTileEntity(xCoord, yCoord, zCoord); + if(tile instanceof TileEntityPipeBaseNT) { + ((TileEntityPipeBaseNT) tile).setType(this.type); + } + } @Override public FluidType getType() { diff --git a/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuct.java b/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuct.java index 2df4d8c60..9db606172 100644 --- a/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuct.java +++ b/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuct.java @@ -3,11 +3,13 @@ package com.hbm.tileentity.conductor; import java.util.ArrayList; import java.util.List; +import com.hbm.blocks.ModBlocks; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids; import com.hbm.interfaces.IFluidDuct; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.lib.Library; +import com.hbm.tileentity.network.TileEntityPipeBaseNT; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -31,7 +33,14 @@ public class TileEntityOilDuct extends TileEntity implements IFluidDuct { //if(!worldObj.isRemote) // PacketDispatcher.wrapper.sendToAll(new TEFluidPipePacket(xCoord, yCoord, zCoord, type)); - this.updateConnections(); + //this.updateConnections(); + + worldObj.setBlock(xCoord, yCoord, zCoord, ModBlocks.fluid_duct_neo, 2, 3); + + TileEntity tile = worldObj.getTileEntity(xCoord, yCoord, zCoord); + if(tile instanceof TileEntityPipeBaseNT) { + ((TileEntityPipeBaseNT) tile).setType(this.type); + } } public void updateConnections() { diff --git a/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java b/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java index 059876707..940494cbc 100644 --- a/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java +++ b/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java @@ -3,10 +3,12 @@ package com.hbm.tileentity.conductor; import java.util.ArrayList; import java.util.List; +import com.hbm.blocks.ModBlocks; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids; import com.hbm.interfaces.IFluidDuct; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; +import com.hbm.tileentity.network.TileEntityPipeBaseNT; import net.minecraft.tileentity.TileEntity; @@ -14,6 +16,22 @@ public class TileEntityOilDuctSolid extends TileEntity implements IFluidDuct { public FluidType type = Fluids.OIL; public List uoteab = new ArrayList(); + + @Override + public void updateEntity() { + + //if(!worldObj.isRemote) + // PacketDispatcher.wrapper.sendToAll(new TEFluidPipePacket(xCoord, yCoord, zCoord, type)); + + //this.updateConnections(); + + worldObj.setBlock(xCoord, yCoord, zCoord, ModBlocks.fluid_duct_paintable); + + TileEntity tile = worldObj.getTileEntity(xCoord, yCoord, zCoord); + if(tile instanceof TileEntityPipeBaseNT) { + ((TileEntityPipeBaseNT) tile).setType(this.type); + } + } @Override public FluidType getType() { diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java index 2a3d52faf..568431479 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java @@ -876,7 +876,6 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple cachedCasingConfig = null; } - @SideOnly(Side.CLIENT) @Override public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { return new ContainerTurretBase(player.inventory, this); diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBrandon.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBrandon.java index 02273e7be..dd6c17687 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBrandon.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBrandon.java @@ -6,6 +6,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.world.World; public class TileEntityTurretBrandon extends TileEntityTurretBaseNT { @@ -33,6 +34,11 @@ public class TileEntityTurretBrandon extends TileEntityTurretBaseNT { // TODO Auto-generated method stub return null; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } @Override @SideOnly(Side.CLIENT) diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 7f7b61e17..beb93e933 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -598,6 +598,7 @@ hbmfluid.chlorine=Chlorgas hbmfluid.coalcreosote=Kohleteer-Kreosot hbmfluid.coalgas=Kohlebenzin hbmfluid.coalgas_leaded=Bleikohlebenzin +hbmfluid.colloid=Kolloid hbmfluid.coaloil=Kohleöl hbmfluid.coolant=Kühlflüssigkeit hbmfluid.coolant_hot=Heiße Kühlflüssigkeit @@ -636,6 +637,7 @@ hbmfluid.lubricant=Schmiermittel hbmfluid.mercury=Quecksilber hbmfluid.mug=Mug Root Beer hbmfluid.mug_hot=Heißes Mug Root Beer +hbmfluid.mustardgas=Senfgas hbmfluid.naphtha=Mitteldestillat hbmfluid.naphtha_crack=Crack-Mitteldestillat hbmfluid.nitan=NITAN© 100 Oktan Supertreibstoff @@ -648,6 +650,7 @@ hbmfluid.pain=Pandemonium(III)tantalit-Lösung hbmfluid.petroil=Gemisch hbmfluid.petroil_leaded=Bleigemisch hbmfluid.petroleum=Petroleumgas +hbmfluid.phosgene=Phosgen hbmfluid.plasma_bf=Balefire-Plasma hbmfluid.plasma_dh3=Deuterium-Helium-3-Plasma hbmfluid.plasma_dt=Deuterium-Tritium-Plasma diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 0651c0bc3..3da4ce06f 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -1156,6 +1156,7 @@ hbmfluid.coalcreosote=Coal Tar Creosote hbmfluid.coalgas=Coal Gasoline hbmfluid.coalgas_leaded=Leaded Coal Gasoline hbmfluid.coaloil=Coal Oil +hbmfluid.colloid=Colloid hbmfluid.coolant=Coolant hbmfluid.coolant_hot=Hot Coolant hbmfluid.crackoil=Cracked Oil @@ -1193,6 +1194,7 @@ hbmfluid.lubricant=Engine Lubricant hbmfluid.mercury=Mercury hbmfluid.mug=Mug Root Beer hbmfluid.mug_hot=Hot Mug Root Beer +hbmfluid.mustardgas=Mustard Gas hbmfluid.naphtha=Naphtha hbmfluid.naphtha_crack=Cracked Naphtha hbmfluid.nitan=NITAN© 100 Octane Super Fuel @@ -1205,6 +1207,7 @@ hbmfluid.pain=Pandemonium(III)tantalite Solution hbmfluid.petroil=Petroil hbmfluid.petroil_leaded=Leaded Petroil hbmfluid.petroleum=Petroleum Gas +hbmfluid.phosgene=Phosgene hbmfluid.plasma_bf=Balefire Plasma hbmfluid.plasma_dh3=Deuterium-Helium-3 Plasma hbmfluid.plasma_dt=Deuterium-Tritium Plasma diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/colloid.png b/src/main/resources/assets/hbm/textures/gui/fluids/colloid.png new file mode 100644 index 000000000..bd97d212d Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/colloid.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/mustardgas.png b/src/main/resources/assets/hbm/textures/gui/fluids/mustardgas.png new file mode 100644 index 000000000..30ba3d6b9 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/mustardgas.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/phosgene.png b/src/main/resources/assets/hbm/textures/gui/fluids/phosgene.png new file mode 100644 index 000000000..83d75da9b Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/phosgene.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/toxin_base.png b/src/main/resources/assets/hbm/textures/gui/fluids/toxin_base.png new file mode 100644 index 000000000..6d37902b8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/toxin_base.png differ diff --git a/src/main/resources/assets/hbm/textures/items/ammo_arty_chlorine.png b/src/main/resources/assets/hbm/textures/items/ammo_arty_chlorine.png new file mode 100644 index 000000000..d066d3c5d Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/ammo_arty_chlorine.png differ diff --git a/src/main/resources/assets/hbm/textures/items/ammo_arty_mustard_gas.png b/src/main/resources/assets/hbm/textures/items/ammo_arty_mustard_gas.png new file mode 100644 index 000000000..ce4be2388 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/ammo_arty_mustard_gas.png differ diff --git a/src/main/resources/assets/hbm/textures/items/ammo_arty_phosgene.png b/src/main/resources/assets/hbm/textures/items/ammo_arty_phosgene.png new file mode 100644 index 000000000..aa4c7cccd Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/ammo_arty_phosgene.png differ diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_COLLOID.png b/src/main/resources/assets/hbm/textures/models/tank/tank_COLLOID.png new file mode 100644 index 000000000..1f14fd106 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/tank/tank_COLLOID.png differ diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_MUSTARDGAS.png b/src/main/resources/assets/hbm/textures/models/tank/tank_MUSTARDGAS.png new file mode 100644 index 000000000..424fd0ed1 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/tank/tank_MUSTARDGAS.png differ diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_PHOSGENE.png b/src/main/resources/assets/hbm/textures/models/tank/tank_PHOSGENE.png new file mode 100644 index 000000000..e6f057925 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/tank/tank_PHOSGENE.png differ