From a8b046f46bd3e0d9303317993e92b85631f2f46f Mon Sep 17 00:00:00 2001 From: Wolf Date: Sat, 27 Dec 2025 17:19:45 -0500 Subject: [PATCH] Bringing up to date because yeah --- src/main/java/com/hbm/main/CraftingManager.java | 9 +++++---- src/main/java/com/hbm/main/ModEventHandler.java | 15 +++++++++++++++ src/main/resources/assets/hbm/lang/en_US.lang | 14 +++++++------- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 876a18718..2f954ee7f 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -2,6 +2,7 @@ package com.hbm.main; import com.hbm.blocks.BlockEnums.DecoCabinetEnum; import com.hbm.blocks.BlockEnums.LightstoneType; +import com.hbm.blocks.BlockEnums.EnumAbsorberTier; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.generic.BlockConcreteColoredExt.EnumConcreteType; import com.hbm.blocks.generic.BlockGenericStairs; @@ -671,10 +672,10 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.ammo_bag, 1), new Object[] { "LLL", "MGM", "LLL", 'L', Items.leather, 'G', WEAPONSTEEL.plate(), 'M', WEAPONSTEEL.mechanism() }); addRecipeAuto(new ItemStack(ModItems.ammo_bag, 1), new Object[] { "LLL", "MGM", "LLL", 'L', ANY_RUBBER.ingot(), 'G', WEAPONSTEEL.plate(), 'M', WEAPONSTEEL.mechanism() }); - addRecipeAuto(new ItemStack(ModBlocks.absorber, 1), new Object[] { "ICI", "CPC", "ICI", 'I', CU.ingot(), 'C', COAL.dust(), 'P', PB.dust() }); - addRecipeAuto(new ItemStack(ModBlocks.absorber_red, 1), new Object[] { "ICI", "CPC", "ICI", 'I', TI.ingot(), 'C', COAL.dust(), 'P', ModBlocks.absorber }); - addRecipeAuto(new ItemStack(ModBlocks.absorber_green, 1), new Object[] { "ICI", "CPC", "ICI", 'I', ANY_PLASTIC.ingot(), 'C', ModItems.powder_desh_mix, 'P', ModBlocks.absorber_red }); - addRecipeAuto(new ItemStack(ModBlocks.absorber_pink, 1), new Object[] { "ICI", "CPC", "ICI", 'I', BIGMT.ingot(), 'C', ModItems.powder_nitan_mix, 'P', ModBlocks.absorber_green }); + addRecipeAuto(new ItemStack(ModBlocks.rad_absorber, 1, EnumAbsorberTier.BASE.ordinal()),new Object[] { "ICI", "CPC", "ICI", 'I', CU.ingot(), 'C', COAL.dust(), 'P', PB.dust() }); + addRecipeAuto(new ItemStack(ModBlocks.rad_absorber, 1, EnumAbsorberTier.RED.ordinal()),new Object[] { "ICI", "CPC", "ICI", 'I', TI.ingot(), 'C', COAL.dust(),'P', new ItemStack(ModBlocks.rad_absorber, 1, EnumAbsorberTier.BASE.ordinal()) }); + addRecipeAuto(new ItemStack(ModBlocks.rad_absorber, 1, EnumAbsorberTier.GREEN.ordinal()),new Object[] { "ICI", "CPC", "ICI", 'I', ANY_PLASTIC.ingot(), 'C', ModItems.powder_desh_mix,'P', new ItemStack(ModBlocks.rad_absorber, 1, EnumAbsorberTier.RED.ordinal()) }); + addRecipeAuto(new ItemStack(ModBlocks.rad_absorber, 1, EnumAbsorberTier.PINK.ordinal()), new Object[] { "ICI", "CPC", "ICI", 'I', BIGMT.ingot(), 'C', ModItems.powder_nitan_mix,'P', new ItemStack(ModBlocks.rad_absorber, 1, EnumAbsorberTier.GREEN.ordinal()) }); addRecipeAuto(new ItemStack(ModBlocks.decon, 1), new Object[] { "BGB", "SAS", "BSB", 'B', BE.ingot(), 'G', Blocks.iron_bars, 'S', STEEL.ingot(), 'A', ModBlocks.absorber }); addRecipeAuto(new ItemStack(ModBlocks.machine_minirtg, 1), new Object[] { "LLL", "PPP", "TRT", 'L', PB.plate(), 'P', PU238.billet(), 'T', ModItems.thermo_element, 'R', ModItems.rtg_unit }); addRecipeAuto(new ItemStack(ModBlocks.machine_powerrtg, 1), new Object[] { "SRS", "PTP", "SRS", 'S', STAR.ingot(), 'R', ModItems.rtg_unit, 'P', PO210.billet(), 'T', TS.dust() }); diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java index 18cc855fb..e2e189d01 100644 --- a/src/main/java/com/hbm/main/ModEventHandler.java +++ b/src/main/java/com/hbm/main/ModEventHandler.java @@ -1071,6 +1071,21 @@ public class ModEventHandler { event.getChunk().func_150807_a(x, y, z, Blocks.air, 0); } }*/ + + for(int x = 0; x < 16; x++) for(int y = 0; y < 255; y++) for(int z = 0; z < 16; z++) { + if(event.getChunk().getBlock(x, y, z) == ModBlocks.absorber) { + event.getChunk().func_150807_a(x, y, z, ModBlocks.rad_absorber, 0); + } + else if(event.getChunk().getBlock(x, y, z) == ModBlocks.absorber_red) { + event.getChunk().func_150807_a(x, y, z, ModBlocks.rad_absorber, 1); + } + else if(event.getChunk().getBlock(x, y, z) == ModBlocks.absorber_green) { + event.getChunk().func_150807_a(x, y, z, ModBlocks.rad_absorber, 2); + } + else if(event.getChunk().getBlock(x, y, z) == ModBlocks.absorber_pink) { + event.getChunk().func_150807_a(x, y, z, ModBlocks.rad_absorber, 3); + } + } } @SubscribeEvent diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index e0441e724..6c24f7bf0 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -5046,15 +5046,15 @@ stat.ntmBullets=Rounds Fired stat.ntmLegendary=Legendary Items Created stat.ntmMines=Mines Stepped on -tile.absorber.name=Radiation Absorber OLD -tile.absorber_green.name=Advanced Radiation Absorber OLD -tile.absorber_pink.name=Elite Radiation Absorber OLD -tile.absorber_red.name=Enhanced Radiation Absorber OLD +tile.absorber.name=Radiation Absorber (LEGACY) +tile.absorber_green.name=Advanced Radiation Absorber (LEGACY) +tile.absorber_pink.name=Elite Radiation Absorber (LEGACY) +tile.absorber_red.name=Enhanced Radiation Absorber (LEGACY) tile.rad_absorber.base.name=Radiation Absorber -tile.rad_absorber.red.name=Enhanced Radiation Absorber -tile.rad_absorber.green.name=Advanced Radiation Absorber -tile.rad_absorber.pink.name=Elite Radiation Absorber +tile.rad_absorber.green.name=Enhanced Radiation Absorber +tile.rad_absorber.pink.name=Advanced Radiation Absorber +tile.rad_absorber.red.name=Elite Radiation Absorber tile.acid_block.name=Acid tile.ams_base.name=AMS Base (Deco) tile.ams_emitter.name=AMS Emitter (Deco)