From 25d31aa58c454e3a0ff57b5bc4c871a0ce8b566b Mon Sep 17 00:00:00 2001 From: HbmMods Date: Fri, 24 Jul 2026 17:50:32 +0200 Subject: [PATCH] and some other stuff --- .../blocks/generic/BlockForgottenBrick.java | 8 +++- .../recipes/AssemblyMachineRecipes.java | 16 +++++++ .../hbm/inventory/recipes/PUREXRecipes.java | 27 ++++++----- .../inventory/recipes/anvil/AnvilRecipes.java | 45 ++++++------------ src/main/java/com/hbm/main/NEIConfig.java | 3 ++ src/main/resources/assets/hbm/lang/de_DE.lang | 2 + src/main/resources/assets/hbm/lang/en_US.lang | 2 + .../assets/hbm/textures/blocks/nr_stone.png | Bin 0 -> 789 bytes 8 files changed, 60 insertions(+), 43 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/blocks/nr_stone.png diff --git a/src/main/java/com/hbm/blocks/generic/BlockForgottenBrick.java b/src/main/java/com/hbm/blocks/generic/BlockForgottenBrick.java index cd06db25b..42bb95b16 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockForgottenBrick.java +++ b/src/main/java/com/hbm/blocks/generic/BlockForgottenBrick.java @@ -26,6 +26,7 @@ public class BlockForgottenBrick extends BlockMulti { private IIcon iconHole; private IIcon iconEmpty; private IIcon iconPlanks; + private IIcon iconBricks; public static final int META_DEFAULT = 0; public static final int META_BW = 1; @@ -33,6 +34,7 @@ public class BlockForgottenBrick extends BlockMulti { public static final int META_HOLE = 3; public static final int META_HOLE_EMPTY = 4; public static final int META_NULLROOM_WOOD = 5; + public static final int META_NULLROOM_STONE = 6; public BlockForgottenBrick() { super(Material.rock); @@ -49,6 +51,7 @@ public class BlockForgottenBrick extends BlockMulti { this.iconHole = reg.registerIcon(RefStrings.MODID + ":brick_forgotten_hole"); this.iconEmpty = reg.registerIcon(RefStrings.MODID + ":brick_forgotten_hole_empty"); this.iconPlanks = reg.registerIcon(RefStrings.MODID + ":nr_planks"); + this.iconBricks = reg.registerIcon(RefStrings.MODID + ":nr_stone"); } @Override @@ -73,6 +76,9 @@ public class BlockForgottenBrick extends BlockMulti { if(meta == META_NULLROOM_WOOD) { return this.iconPlanks; } + if(meta == META_NULLROOM_STONE) { + return this.iconBricks; + } if(side == 0 || side == 1) return this.iconTop; return this.blockIcon; @@ -94,7 +100,7 @@ public class BlockForgottenBrick extends BlockMulti { return false; } - @Override public int getSubCount() { return 6; } + @Override public int getSubCount() { return 7; } @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java index 4b34d1d84..a8d060ca2 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java @@ -30,6 +30,7 @@ import com.hbm.items.machine.ItemBatterySC.EnumBatterySC; import com.hbm.items.machine.ItemCircuit.EnumCircuitType; import com.hbm.items.machine.ItemDrillbit.EnumDrillType; import com.hbm.items.machine.ItemPACoil.EnumCoilType; +import com.hbm.items.machine.ItemPileRodMK2.EnumPileRod; import com.hbm.items.machine.ItemPistons.EnumPistonType; import com.hbm.items.weapon.ItemAmmoHIMARS; import com.hbm.items.weapon.grenade.ItemGrenadeFuze.EnumGrenadeFuze; @@ -160,6 +161,21 @@ public class AssemblyMachineRecipes extends GenericRecipes { this.register(new GenericRecipe("ass.protoreactor").setup(200, 100).outputItems(new ItemStack(ModItems.dysfunctional_reactor, 1)) .inputItems(new OreDictStack(STEEL.shell(), 4), new OreDictStack(PB.plateCast(), 4), new ComparableStack(ModItems.rod_quad_empty, 10), new OreDictStack(KEY_BROWN, 3))); + // pile rods + String autoPileRod = "autoswitch.pilerod"; + this.register(new GenericRecipe("ass.pilepabe").setup(40, 200).outputItems(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.RA226BE.ordinal())) + .inputItems(new ComparableStack(ModItems.billet_ra226be, 3)).setGroup(autoPileRod, INSTANCE)); + this.register(new GenericRecipe("ass.pilepobe").setup(40, 200).outputItems(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.PO210BE.ordinal())) + .inputItems(new ComparableStack(ModItems.billet_po210be, 3)).setGroup(autoPileRod, INSTANCE)); + this.register(new GenericRecipe("ass.pilezr").setup(40, 200).outputItems(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.ZR.ordinal())) + .inputItems(new OreDictStack(ZR.billet(), 3)).setGroup(autoPileRod, INSTANCE)); + this.register(new GenericRecipe("ass.pilenu").setup(40, 200).outputItems(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.NU.ordinal())) + .inputItems(new OreDictStack(U.billet(), 3)).setGroup(autoPileRod, INSTANCE)); + this.register(new GenericRecipe("ass.pilepu239").setup(40, 200).outputItems(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.PU239.ordinal())) + .inputItems(new OreDictStack(PU239.billet(), 3)).setGroup(autoPileRod, INSTANCE)); + this.register(new GenericRecipe("ass.pilergp").setup(40, 200).outputItems(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.RGP.ordinal())) + .inputItems(new OreDictStack(PURG.billet(), 3)).setGroup(autoPileRod, INSTANCE)); + // powders String autoCyclotron = "autoswitch.cyclotron"; this.register(new GenericRecipe("ass.partlith").setup(40, 100).outputItems(new ItemStack(ModItems.part_lithium, 8)) diff --git a/src/main/java/com/hbm/inventory/recipes/PUREXRecipes.java b/src/main/java/com/hbm/inventory/recipes/PUREXRecipes.java index 68f03ae6b..0aef690b3 100644 --- a/src/main/java/com/hbm/inventory/recipes/PUREXRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/PUREXRecipes.java @@ -13,6 +13,7 @@ import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.recipes.loader.GenericRecipes; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemPWRFuel.EnumPWRFuel; +import com.hbm.items.machine.ItemPileRodMK2.EnumPileRod; import com.hbm.items.machine.ItemWatzPellet.EnumWatzType; import net.minecraft.item.ItemStack; @@ -60,23 +61,25 @@ public class PUREXRecipes extends GenericRecipes { //CP-1 String autoPile = "autoswitch.pile"; - this.register((PUREXRecipe) new PUREXRecipe("purex.pilepu").setup(40, pilePower).setNameWrapper("purex.recycle").setGroup(autoPile, this) - .inputItems(new ComparableStack(ModItems.pile_rod_plutonium)) + this.register((PUREXRecipe) new PUREXRecipe("purex.pilepu239").setup(40, pilePower).setNameWrapper("purex.recycle").setGroup(autoPile, this) + .inputItems(new ComparableStack(ModItems.pile_rod, 1, EnumPileRod.PU239)) + .inputFluids(new FluidStack(Fluids.SULFURIC_ACID, 100)) + .outputItems(new ItemStack(ModItems.billet_pu239, 2), + new ItemStack(ModItems.billet_uranium, 1)) + .setIconToFirstIngredient()); + this.register((PUREXRecipe) new PUREXRecipe("purex.pilergp").setup(40, pilePower).setNameWrapper("purex.recycle").setGroup(autoPile, this) + .inputItems(new ComparableStack(ModItems.pile_rod, 1, EnumPileRod.RGP)) .inputFluids(new FluidStack(Fluids.SULFURIC_ACID, 100)) .outputItems(new ItemStack(ModItems.billet_pu_mix, 2), - new ItemStack(ModItems.billet_uranium, 1), - new ItemStack(ModItems.plate_iron, 2)) + new ItemStack(ModItems.billet_uranium, 1)) .setIconToFirstIngredient()); - - this.register((PUREXRecipe) new PUREXRecipe("purex.pilepu239").setup(40, pilePower).setNameWrapper("purex.recycle").setGroup(autoPile, this) - .inputItems(new ComparableStack(ModItems.pile_rod_pu239)) + this.register((PUREXRecipe) new PUREXRecipe("purex.pilewaste").setup(40, pilePower).setNameWrapper("purex.recycle").setGroup(autoPile, this) + .inputItems(new ComparableStack(ModItems.pile_rod, 1, EnumPileRod.WASTE)) .inputFluids(new FluidStack(Fluids.SULFURIC_ACID, 100)) - .outputItems(new ItemStack(ModItems.billet_pu239, 1), - new ItemStack(ModItems.billet_pu_mix, 1), - new ItemStack(ModItems.billet_uranium, 1), - new ItemStack(ModItems.plate_iron, 2)) + .outputItems(new ItemStack(ModItems.billet_nuclear_waste, 2), + new ItemStack(ModItems.billet_polonium, 1)) .setIconToFirstIngredient()); - + // ZIRNOX String autoZirnox = "autoswitch.zirnox"; this.register((PUREXRecipe) new PUREXRecipe("purex.zirnoxnu").setup(100, zirnoxPower).setNameWrapper("purex.recycle").setGroup(autoZirnox, this) diff --git a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java index 0c98d5dc7..c5c3bd1da 100644 --- a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java @@ -25,6 +25,7 @@ import com.hbm.items.ModItems; import com.hbm.items.food.ItemFlask.EnumInfusion; import com.hbm.items.machine.ItemBatterySC.EnumBatterySC; import com.hbm.items.machine.ItemCircuit.EnumCircuitType; +import com.hbm.items.machine.ItemPileRodMK2.EnumPileRod; import com.hbm.util.Tuple.Pair; import net.minecraft.block.Block; @@ -846,30 +847,28 @@ public class AnvilRecipes extends SerializableRecipe { ).setTier(1)); constructionRecipes.add(new AnvilConstructionRecipe( - new ComparableStack(ModItems.pile_rod_uranium), new AnvilOutput[] { - new AnvilOutput(new ItemStack(ModItems.billet_uranium, 3)), - new AnvilOutput(new ItemStack(ModItems.plate_iron, 2)) + new ComparableStack(ModItems.billet_ra226be, 3), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.RA226BE.ordinal())), }).setTier(2)); constructionRecipes.add(new AnvilConstructionRecipe( - new ComparableStack(ModItems.pile_rod_source), new AnvilOutput[] { - new AnvilOutput(new ItemStack(ModItems.billet_ra226be, 3)), - new AnvilOutput(new ItemStack(ModItems.plate_iron, 2)) + new ComparableStack(ModItems.billet_po210be, 3), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.PO210BE.ordinal())), }).setTier(2)); constructionRecipes.add(new AnvilConstructionRecipe( - new ComparableStack(ModItems.pile_rod_boron), new AnvilOutput[] { - new AnvilOutput(new ItemStack(ModItems.ingot_boron, 2)), - new AnvilOutput(new ItemStack(Items.stick, 2)) + new OreDictStack(ZR.billet(), 3), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.ZR.ordinal())), }).setTier(2)); constructionRecipes.add(new AnvilConstructionRecipe( - new ComparableStack(ModItems.pile_rod_detector), new AnvilOutput[] { - new AnvilOutput(new ItemStack(ModItems.ingot_boron, 2)), - new AnvilOutput(new ItemStack(ModItems.motor, 1)), - new AnvilOutput(DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE)) + new OreDictStack(U.billet(), 3), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.NU.ordinal())), }).setTier(2)); constructionRecipes.add(new AnvilConstructionRecipe( - new ComparableStack(ModItems.pile_rod_lithium), new AnvilOutput[] { - new AnvilOutput(new ItemStack(ModItems.lithium, 1)), - new AnvilOutput(new ItemStack(ModItems.cell_empty, 1)) + new OreDictStack(PU239.billet(), 3), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.PU239.ordinal())), + }).setTier(2)); + constructionRecipes.add(new AnvilConstructionRecipe( + new OreDictStack(PURG.billet(), 3), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.RGP.ordinal())), }).setTier(2)); //RBMK @@ -968,20 +967,6 @@ public class AnvilRecipes extends SerializableRecipe { new AnvilOutput(new ItemStack(ModItems.circuit, 1, EnumCircuitType.BASIC.ordinal()), 0.5F), }).setTier(4)); - } else { - constructionRecipes.add(new AnvilConstructionRecipe( - new ComparableStack(ModItems.pile_rod_plutonium), new AnvilOutput[] { - new AnvilOutput(new ItemStack(ModItems.billet_pu_mix, 2)), - new AnvilOutput(new ItemStack(ModItems.billet_nuclear_waste, 1)), - new AnvilOutput(new ItemStack(ModItems.plate_iron, 1)) - }).setTier(2)); - constructionRecipes.add(new AnvilConstructionRecipe( - new ComparableStack(ModItems.pile_rod_pu239), new AnvilOutput[] { - new AnvilOutput(new ItemStack(ModItems.billet_pu239, 1)), - new AnvilOutput(new ItemStack(ModItems.billet_pu_mix, 1)), - new AnvilOutput(new ItemStack(ModItems.billet_nuclear_waste, 1)), - new AnvilOutput(new ItemStack(ModItems.plate_iron, 2)) - }).setTier(2)); } constructionRecipes.add(new AnvilConstructionRecipe( diff --git a/src/main/java/com/hbm/main/NEIConfig.java b/src/main/java/com/hbm/main/NEIConfig.java index 68a296fd0..25f58dc2f 100644 --- a/src/main/java/com/hbm/main/NEIConfig.java +++ b/src/main/java/com/hbm/main/NEIConfig.java @@ -92,6 +92,9 @@ public class NEIConfig implements IConfigureNEI { API.hideItem(new ItemStack(ModBlocks.conveyor_double)); API.hideItem(new ItemStack(ModBlocks.conveyor_triple)); + API.hideItem(new ItemStack(ModBlocks.brick_forgotten)); + API.hideItem(new ItemStack(ModBlocks.brick_forgotten_lock)); + API.registerHighlightIdentifier(ModBlocks.plushie, new IHighlightHandler() { @Override public ItemStack identifyHighlight(World world, EntityPlayer player, MovingObjectPosition mop) { int x = mop.blockX; diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index f558e61a4..501693dbc 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -137,6 +137,7 @@ ass.nitra=Nitra zu Munition autoswitch=Teil der Rezeptgruppe "%s"$Rezept ändert sich basierend auf das erste Item autoswitch.cyclotron=Zyklotron-Pulverkisten autoswitch.pile=Wiederaufbereitung Chicago-Pile-Brennstoff +autoswitch.pilerod=Chicago-Pile-Brennstoff autoswitch.plate=Wiederaufbereitung Plattenbrennstoff autoswitch.plates=Metallplatten autoswitch.pwr=Wiederaufbereitung PWR-Brennstoff @@ -3981,6 +3982,7 @@ tile.brick_dungeon_flat.name=Berzelianitblock tile.brick_dungeon_tile.name=Berzelianitfliese tile.brick_fire.name=Schamottsteinziegel tile.brick_fire_stairs.name=Schamottsteintreppe +tile.brick_forgotten.name=Block tile.brick_jungle.name=Enargitziegel tile.brick_jungle_circle.name=Mechanistenzirkel tile.brick_jungle_cracked.name=Rissige Enargitziegel diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index e38e9fc4a..6491f3b64 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -192,6 +192,7 @@ ass.nitra=Nitra to Ammunition autoswitch=Part of auto switch group "%s"$Recipe changes based on first ingredient autoswitch.cyclotron=Cyclotron Powder Boxes autoswitch.pile=Reprocessing Chicago Pile Rods +autoswitch.pilerod=Chicago Pile Rods autoswitch.plate=Reprocessing Plate Fuel autoswitch.plates=Metal Plates autoswitch.pwr=Reprocessing PWR Fuel @@ -5196,6 +5197,7 @@ tile.brick_dungeon_flat.name=Berzelianite Block tile.brick_dungeon_tile.name=Berzelianite Tile tile.brick_fire.name=Firebricks tile.brick_fire_stairs.name=Firebrick Stairs +tile.brick_forgotten.name=Block tile.brick_jungle.name=Enargite Bricks tile.brick_jungle_circle.name=Mechanist's Circle tile.brick_jungle_cracked.name=Cracked Enargite Bricks diff --git a/src/main/resources/assets/hbm/textures/blocks/nr_stone.png b/src/main/resources/assets/hbm/textures/blocks/nr_stone.png new file mode 100644 index 0000000000000000000000000000000000000000..609c9a76650f411aac722ff5a4cf399e6690f1bd GIT binary patch literal 789 zcmV+w1M2*VP)rJ*q$V$6VgE1g3?^7N}z5kb;$>?iX=?Io{RPRogTT{eB-~3|W>D$1y9t!Wzq--D5Nw z0U(56u~=ZOWjGvieSJ;GIY(KRBuPRL1SCm9_idMU(1H&?|NF_TngO7-rq}DSuGZvv zj_><)zCC>7cm5lI$EQc+Tgjt&43J#hB zk|d!Q_Yg*qrYYZ(?=*fx$6AY0ic*xgXGi^1vo%|yEMgb$5JqsTZkdD=ek4CQ3Xkab z`$Pv3JV58>=H^A9dc+Go+`uvQr#w^-c$G&>i-(6oF&>OjN|B~1byzbS&FGw;pOZi3 zAYe9{u?&{D#_?XgC;2Dg;^Kn4><-U(Y_l!BevdwVq?8CD=qwfswALIR9&&eg$Hsrj zGYAG0ML|_nq*;p8l0p^eT*E%B*J}WLAq4GlOPZ!Ar5NfVGL*z|%wRA;DTPuBYb{;V zWf$*o&i#?zS*aB$Xl2VZm}0FZ&vUA(`g7h?Ou4dvXF~)!Z8B20M=iTrft!pvH z-~z{&voAzZgfWKG(J25Q4?p5pKEct^(cin>j;zQKzQE=d&+~ZQf6cO4vM=}f`tMf) z6QH#w%QBpE%;$5qc8hm;dD#M3Ybk9B1^_IUHfU*O%S2CJI3>ncS2| T&W(I)00000NkvXXu0mjf6`gTv literal 0 HcmV?d00001