From 07a73130ce4adce99730a953cdbe05c0dff37e81 Mon Sep 17 00:00:00 2001 From: Boblet Date: Thu, 7 Apr 2022 16:51:04 +0200 Subject: [PATCH] oily debris recycling, new upgrade textures --- .../java/com/hbm/crafting/MineralRecipes.java | 1 + .../hbm/inventory/FluidContainerRegistry.java | 5 +++-- src/main/java/com/hbm/inventory/FluidTank.java | 5 ----- .../java/com/hbm/inventory/fluid/Fluids.java | 6 +++++- .../hbm/inventory/recipes/ChemplantRecipes.java | 11 +++++++++++ .../hbm/inventory/recipes/ShredderRecipes.java | 10 ++++++++++ src/main/java/com/hbm/items/ModItems.java | 3 +++ src/main/resources/assets/hbm/lang/de_DE.lang | 1 + src/main/resources/assets/hbm/lang/en_US.lang | 1 + .../assets/hbm/textures/items/scrap_oil.png | Bin 0 -> 611 bytes .../hbm/textures/items/upgrade_speed_1.png | Bin 338 -> 390 bytes .../hbm/textures/items/upgrade_speed_2.png | Bin 326 -> 357 bytes .../hbm/textures/items/upgrade_speed_3.png | Bin 313 -> 340 bytes .../hbm/textures/items/upgrade_template.png | Bin 283 -> 328 bytes .../hbm/textures/items/upgrade_template_alt.png | Bin 0 -> 283 bytes 15 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/items/scrap_oil.png create mode 100644 src/main/resources/assets/hbm/textures/items/upgrade_template_alt.png 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 0000000000000000000000000000000000000000..ede661e8fc31240e39d9394e8027ee5e61ba741a GIT binary patch literal 611 zcmV-p0-XJcP)rB{Bcnd zxMp0I$MGgM^Ltc!D{;|S+1Ta#)=%c_Z#cOEBS{-4SKwwWimN=5T$odbLey}Tha$r3 z&lbHMVfqGB2pR$X67%*dJ)O;Doo!q+q{KSFeY2h=XO|BXHV-;NtT+X(hYSLGE%Wvo z@y=$l&JKy;87jOL$N{w^@Mgr~LiITWjlRKoTr@_Ki=^x|4E+jOC(p;>X`+!3{fRMB z3$v<}LDZ;|c&vdJ?&ScsG9j1r~Elw~Ow zC4%BsEK2{UXE;(x~vBp}jRsovt(R+pNP_?X%k%yn{L807Ks}C2nF9Ne27dv)B%w2(F9js(3t>p~ z@QvkpRBwM^)+M@7Tvn?9JWi*ZxT!TQ+vfPX2E!4R&$AoS1)NsYvc#;*`xhLoDh>t% zP-+u59S4Bt`!}rejyuRhFG&D4BbY8^pdQD$dzGRI^*BbaM%gRy>bgZ5TSB6~NV_3g zDVg}bXr%qxpN%RN{O@^B3CD3x&XYmF6ZO%&Q3C2SU-{?FkDzCw``l1Z5s)B tya8!9I~b0z${ETz{4Xzeq8fZFvX}q>002ovPDHLkV1k|gnWX># delta 295 zcmV+?0oeYA1JVMJG=B+6L_t(Ijg?a|Zo@DPJQYSXd2kmaTfboMnKKILm`CIdS@VM+ z4=7NeC{VzU;AH+GgMf@eCV6p&M20QVMtT!0;R tdN2AWu*USiWgsbTqr@lM_@7M#fIC0Lk!7>FtP%hK002ovPDHLkV1kQQhC%=U 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 5268b5b2c9263f64abe235d410286c21f8834c49..e26b47aa6a248e2b2413abed7fe8b082abbd871a 100644 GIT binary patch delta 315 zcmV-B0mS~s0_6gbGk*abNkls)05nSpAG~Cl1mB-XB$Eh5!rP#6qXV3+F_rx(&){;+1Y)w(1I-H@^Xl{@_TK9 z>6B_?vAz7D307$;09BR&;7=x78~^fEmN7DB&{^O=R9VKXEPuINuWPL=<|0Wfg;KIg zQ<1MLk$0p}YAe=Si`H6h!m!RIvB>$6c&{fHR2w+i%JVudAV>Q|?6iNxuxeBEmTmT-Th|}eA zXD6L5G(+M7%QS^XJPrcJL0}2`cngxma<|{{8+&+r4n98dhaHuB_#aFPwh(N~OjrN_ N002ovPDHLkV1i~1jcWh^ delta 284 zcmV+%0ptGV0>%Q6Gk*a6NklC8QVmr3a1_D@PI%`b#D?bYf03afX7J1eG!Jk`Z z%!?v2_B;_`^LVHzgXJ;D@^Jea`+LibmKm4b4%?;~1Wg8YHGe0Z&cJ%)UR4#WwJ5cQ zHKrpXD1Rum7VDN!J16&`W&SyU??DniuI~3y$1KahX*%Gd000n*tt6wV0Q(7t5GvHa zUqYD4qE~{ShXi;}n54p3Cbe_GXDTBVisy4OWlqy^6>8_c1|dqVQ9CET4PcGwu6ZtQ iqr^ws_|GN+z!eKTSB`6wa>OG50000M=w?5ZlF1vh@Az_x$(4^}D6ng&i4_#aK#RmBc*ygZ!dmoQ&>{rj9a<#91pv!D$N74_w-T=lU6aJXaiJ5Bvkc=b wa|9vY0jrYtha;Zf7~tJLc>h2;^kfe3-=LnkPOFc-?*IS*07*qoM6N<$f=1(wj{pDw delta 271 zcmV+q0r39R0=WW^Gk*Z^NklNNaTJLxk0+BlCG+f_O&d3mt~XL9%q~{qpAtJ(SI72NUmim$`T1PqtQA# zcMPp_@i%xGv$}wPgH7n%_kA+4C<>T7pK!AR01%3;VnIsV)Kc9;&n>5Ev`Ppy$=O+Td8$@`W VN>xXWEC2ui00>D%PDHLkV1h@+cL@Lh 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 7521f2a9b38acab6143091690db0f08110453a7e..2440ecca937dc82afa1752d583f2d7222f6fc22d 100644 GIT binary patch delta 285 zcmV+&0pk9f0>}c8G=Kj|L_t(Ijm?uWZi7G&MW5{yX?%f5p~w-Y#jT|+DN?$QI09YB zDd-Ugu&7otEfO?{16Yx$e1J4*qDf&9*(?aV%dbXHyMJbOW?>-hGOeD`TlsPbND{t& z96HGteNa`E0$6JSFveURyyVte;y7N68qCRBOVc#ud44v~E`L*!gpbE9#u&md1Rw|k z_WQjPd!C1g@cw;(Gys1sxKp@O|G+@IOf~X# zuJ=oc2pajSuP^#gZ+7Pmd)wZXxkyXatHC1mOLB{xDfE{`1Q8i6dyG5M$k)Tu$ZwqB j?i7wE)~gZc2^Rhf5|f4Be5kQA00000NkvXXu0mjfN<4)Y delta 239 zcmVbgDzXP%ic41+nmU|AN7 z^_drB$C&)dp`@_EP zPcJ&>5JK2+s*F$YI)T-u>k8icRRs(DChVySSqa;9odNzTIOlF9QB{aBB80HfxqNn6 p`4mKy+O}1|002ovPDHLkV1j^bYYqSa 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 0000000000000000000000000000000000000000..7521f2a9b38acab6143091690db0f08110453a7e GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfG&z_)5OWba@#tM{%CGdAo;*~g5?XoPrspcb>`~ePu@SEbt{c6lMFbk?G zd6oY>KaYVS?OMiE^VHUyZjM*G>{!z0%{1g`w%n5tDc19N2U~i)i-OXMRav&@H>5tz zoMmv{c-^06nGPUp2-yK}?)KA!M_B(^E}nS&<;bTmJJto)|5s56mgkyYg_2{z{mVr eHaA@uelW%4PWV<*YMlf09fPN