diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index 1b20fba59..d7875c8ac 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -67,6 +67,7 @@ public class MineralRecipes { add1To9Pair(ModItems.ingot_pb209, ModItems.nugget_pb209); add1To9Pair(ModItems.ingot_ra226, ModItems.nugget_ra226); add1To9Pair(ModItems.ingot_actinium, ModItems.nugget_actinium); + add1To9Pair(ModItems.ingot_arsenic, ModItems.nugget_arsenic); add1To9Pair(ModItems.ingot_pu241, ModItems.nugget_pu241); add1To9Pair(ModItems.ingot_am241, ModItems.nugget_am241); diff --git a/src/main/java/com/hbm/inventory/FluidContainerRegistry.java b/src/main/java/com/hbm/inventory/FluidContainerRegistry.java index a78097093..1e53bb223 100644 --- a/src/main/java/com/hbm/inventory/FluidContainerRegistry.java +++ b/src/main/java/com/hbm/inventory/FluidContainerRegistry.java @@ -23,6 +23,7 @@ public class FluidContainerRegistry { FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(Items.lava_bucket), new ItemStack(Items.bucket), Fluids.LAVA, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bucket_mud), new ItemStack(Items.bucket), Fluids.WATZ, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bucket_schrabidic_acid), new ItemStack(Items.bucket), Fluids.SCHRABIDIC, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bucket_sulfuric_acid), new ItemStack(Items.bucket), Fluids.SULFURIC_ACID, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_full), new ItemStack(ModItems.gas_empty), Fluids.GAS, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_petroleum), new ItemStack(ModItems.gas_empty), Fluids.PETROLEUM, 1000)); @@ -98,7 +99,7 @@ public class FluidContainerRegistry { sta.stackSize = 1; for(FluidContainer container : allContainers) { - if(container.type.name().equals(type.name()) && + if(container.type == type && ItemStack.areItemStacksEqual(container.fullContainer, sta) && ItemStack.areItemStackTagsEqual(container.fullContainer, sta)) return container.content; @@ -131,7 +132,7 @@ public class FluidContainerRegistry { sta.stackSize = 1; for(FluidContainer container : allContainers) { - if(ItemStack.areItemStacksEqual(container.emptyContainer, sta) && ItemStack.areItemStackTagsEqual(container.emptyContainer, sta) && container.type.name().equals(type.name())) + if(ItemStack.areItemStacksEqual(container.emptyContainer, sta) && ItemStack.areItemStackTagsEqual(container.emptyContainer, sta) && container.type == type) return container.fullContainer.copy(); } diff --git a/src/main/java/com/hbm/inventory/FluidTank.java b/src/main/java/com/hbm/inventory/FluidTank.java index 497d122b5..f2fac384b 100644 --- a/src/main/java/com/hbm/inventory/FluidTank.java +++ b/src/main/java/com/hbm/inventory/FluidTank.java @@ -8,27 +8,22 @@ import org.lwjgl.opengl.GL11; import com.hbm.handler.ArmorModHandler; import com.hbm.interfaces.IPartiallyFillable; import com.hbm.inventory.fluid.FluidType; -import com.hbm.inventory.fluid.FluidType.FluidTrait; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.gui.GuiInfoContainer; import com.hbm.items.ModItems; import com.hbm.items.armor.ItemArmorMod; import com.hbm.items.machine.ItemFluidIdentifier; -import com.hbm.lib.RefStrings; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEFluidPacket; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; public class FluidTank { diff --git a/src/main/java/com/hbm/inventory/fluid/Fluids.java b/src/main/java/com/hbm/inventory/fluid/Fluids.java index abc94ef59..b3a6f77fc 100644 --- a/src/main/java/com/hbm/inventory/fluid/Fluids.java +++ b/src/main/java/com/hbm/inventory/fluid/Fluids.java @@ -86,6 +86,7 @@ public class Fluids { public static FluidType SALIENT; public static FluidType XPJUICE; public static FluidType ENDERJUICE; + public static FluidType SULFURIC_ACID; private static final HashMap idMapping = new HashMap(); private static final HashMap nameMapping = new HashMap(); @@ -181,6 +182,7 @@ public class Fluids { PETROIL_LEADED = new FluidTypeCombustible( "PETROIL_LEADED", 0x44413d, 1, 3, 0, EnumSymbol.NONE).setCombustionEnergy(FuelGrade.MEDIUM, 450_000).setHeatEnergy(((FluidTypeFlammable)PETROIL).getHeatEnergy()); GASOLINE_LEADED = new FluidTypeCombustible( "GASOLINE_LEADED", 0x445772, 1, 2, 0, EnumSymbol.NONE).setCombustionEnergy(FuelGrade.HIGH, 1_500_000).setHeatEnergy(((FluidTypeFlammable)GASOLINE).getHeatEnergy()); COALGAS_LEADED = new FluidTypeCombustible( "COALGAS_LEADED", 0x445772, 1, 2, 0, EnumSymbol.NONE).setCombustionEnergy(FuelGrade.MEDIUM, 250_000).setHeatEnergy(((FluidTypeFlammable)COALGAS).getHeatEnergy()); + SULFURIC_ACID = new FluidType( "SULFURIC_ACID", 0xB0AA64, 3, 0, 2, EnumSymbol.ACID).addTraits(FluidTrait.CORROSIVE); // ^ ^ ^ ^ ^ ^ ^ ^ @@ -250,10 +252,12 @@ public class Fluids { //processing fluids metaOrder.add(SALIENT); metaOrder.add(ACID); + metaOrder.add(SULFURIC_ACID); + //NITRIC_ACID + metaOrder.add(SCHRABIDIC); metaOrder.add(UF6); metaOrder.add(PUF6); metaOrder.add(SAS3); - metaOrder.add(SCHRABIDIC); metaOrder.add(PAIN); metaOrder.add(DEATH); metaOrder.add(WATZ); diff --git a/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java b/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java index 3a4a67f97..348a91b1c 100644 --- a/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java @@ -58,6 +58,10 @@ public class ChemplantRecipes { recipes.add(new ChemRecipe(40, "PEROXIDE", 50) .inputFluids(new FluidStack(Fluids.WATER, 1000)) .outputFluids(new FluidStack(Fluids.ACID, 800))); + recipes.add(new ChemRecipe(90, "SULFURIC_ACID", 50) + .inputItems(new OreDictStack(S.dust())) + .inputFluids(new FluidStack(Fluids.ACID, 800)) + .outputFluids(new FluidStack(Fluids.SULFURIC_ACID, 500))); recipes.add(new ChemRecipe(41, "CIRCUIT_4", 200) .inputItems( new ComparableStack(ModItems.circuit_red_copper), @@ -265,6 +269,13 @@ public class ChemplantRecipes { new ItemStack(ModItems.gem_tantalium), new ItemStack(ModItems.dust, 3)) .outputFluids(new FluidStack(Fluids.WATER, 250))); + recipes.add(new ChemRecipe(91, "ARSENIC", 1200) + .inputItems(new ComparableStack(ModItems.scrap_oil, 256)) + .inputFluids(new FluidStack(Fluids.SULFURIC_ACID, 1000)) + .outputItems( + new ItemStack(ModItems.nugget_arsenic), + new ItemStack(ModItems.sulfur, 2)) + .outputFluids(new FluidStack(Fluids.HEAVYOIL, 1500))); recipes.add(new ChemRecipe(68, "VIT_LIQUID", 100) .inputItems(new ComparableStack(ModBlocks.sand_lead)) .inputFluids(new FluidStack(Fluids.WASTEFLUID, 1000)) diff --git a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java index a584ef210..fe88e9395 100644 --- a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java @@ -257,6 +257,16 @@ public class ShredderRecipes { ShredderRecipes.setRecipe(ModBlocks.sellafield_3, new ItemStack(ModItems.scrap_nuclear, 5)); ShredderRecipes.setRecipe(ModBlocks.sellafield_4, new ItemStack(ModItems.scrap_nuclear, 7)); ShredderRecipes.setRecipe(ModBlocks.sellafield_core, new ItemStack(ModItems.scrap_nuclear, 15)); + + /* + * Fracking debris scrapping + */ + ShredderRecipes.setRecipe(ModBlocks.dirt_dead, new ItemStack(ModItems.scrap_oil, 1)); + ShredderRecipes.setRecipe(ModBlocks.dirt_oily, new ItemStack(ModItems.scrap_oil, 1)); + ShredderRecipes.setRecipe(ModBlocks.sand_dirty, new ItemStack(ModItems.scrap_oil, 1)); + ShredderRecipes.setRecipe(ModBlocks.sand_dirty_red, new ItemStack(ModItems.scrap_oil, 1)); + ShredderRecipes.setRecipe(ModBlocks.stone_cracked, new ItemStack(ModItems.scrap_oil, 1)); + ShredderRecipes.setRecipe(ModBlocks.stone_porous, new ItemStack(ModItems.scrap_oil, 1)); /* * Deco pipe recycling diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 7a07a051d..0eb26e504 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -1134,6 +1134,7 @@ public class ModItems { public static Item scrap_plastic; public static Item scrap; + public static Item scrap_oil; public static Item scrap_nuclear; public static Item trinitite; public static Item nuclear_waste_long; @@ -3875,6 +3876,7 @@ public class ModItems { nuclear_waste_vitrified_tiny = new ItemNuclearWaste().setUnlocalizedName("nuclear_waste_vitrified_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_vitrified_tiny"); scrap_plastic = new ItemPlasticScrap().setUnlocalizedName("scrap_plastic").setTextureName(RefStrings.MODID + ":scrap_plastic"); scrap = new Item().setUnlocalizedName("scrap").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":scrap"); + scrap_oil = new Item().setUnlocalizedName("scrap_oil").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":scrap_oil"); scrap_nuclear = new Item().setUnlocalizedName("scrap_nuclear").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":scrap_nuclear"); containment_box = new ItemLeadBox().setUnlocalizedName("containment_box").setCreativeTab(null).setTextureName(RefStrings.MODID + ":containment_box"); @@ -6820,6 +6822,7 @@ public class ModItems { GameRegistry.registerItem(scrap_plastic, scrap_plastic.getUnlocalizedName()); GameRegistry.registerItem(scrap, scrap.getUnlocalizedName()); + GameRegistry.registerItem(scrap_oil, scrap_oil.getUnlocalizedName()); GameRegistry.registerItem(scrap_nuclear, scrap_nuclear.getUnlocalizedName()); GameRegistry.registerItem(trinitite, trinitite.getUnlocalizedName()); GameRegistry.registerItem(nuclear_waste_long, nuclear_waste_long.getUnlocalizedName()); diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index b28998d0a..2239157eb 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -2541,6 +2541,7 @@ item.schrabidium_shovel.name=Schrabidiumschaufel item.schrabidium_sword.name=Schrabidiumschwert item.scrap.name=Schrott item.scrap_nuclear.name=Radioaktiver Schutt +item.scrap_oil.name=Öliger Schutt item.scrap_plastic.name=Geschreddertes Plastik item.screwdriver.name=Schraubenzieher item.screwdriver_desh.name=Desh-Schraubenzieher diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 6b6e3ff7a..ab6cf8bda 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -2901,6 +2901,7 @@ item.schrabidium_shovel.name=Schrabidium Shovel item.schrabidium_sword.name=Schrabidium Sword item.scrap.name=Scrap item.scrap_nuclear.name=Radioactive Scraps +item.scrap_oil.name=Oily Scraps item.scrap_plastic.name=Plastic Scraps item.screwdriver.name=Screwdriver item.screwdriver.desc=Could be used instead of a fuse... diff --git a/src/main/resources/assets/hbm/textures/items/scrap_oil.png b/src/main/resources/assets/hbm/textures/items/scrap_oil.png new file mode 100644 index 000000000..ede661e8f Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/scrap_oil.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_speed_1.png b/src/main/resources/assets/hbm/textures/items/upgrade_speed_1.png index 902d2c17c..8c34c4fbf 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_speed_1.png and b/src/main/resources/assets/hbm/textures/items/upgrade_speed_1.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_speed_2.png b/src/main/resources/assets/hbm/textures/items/upgrade_speed_2.png index 5268b5b2c..e26b47aa6 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_speed_2.png and b/src/main/resources/assets/hbm/textures/items/upgrade_speed_2.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_speed_3.png b/src/main/resources/assets/hbm/textures/items/upgrade_speed_3.png index 3ff8c0fcc..33a2f865f 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_speed_3.png and b/src/main/resources/assets/hbm/textures/items/upgrade_speed_3.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_template.png b/src/main/resources/assets/hbm/textures/items/upgrade_template.png index 7521f2a9b..2440ecca9 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_template.png and b/src/main/resources/assets/hbm/textures/items/upgrade_template.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_template_alt.png b/src/main/resources/assets/hbm/textures/items/upgrade_template_alt.png new file mode 100644 index 000000000..7521f2a9b Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/upgrade_template_alt.png differ