diff --git a/changelog b/changelog index e28799b15..b1aec00f0 100644 --- a/changelog +++ b/changelog @@ -1,29 +1,4 @@ ## Changed -* Material autogen now creates redstone in ingot form, allowing smaller than block quantities to be cast -* Removed the ancient ZPE blocks -* Drone hitboxes are now way smaller, which should cause them to get stuck when flying less -* The new FENSU now keeps its charge and installed muffler when broken -* Battery sockets are now compatible with comparator output -* Battery sockets now have a tooltip when a battery pack is installed -* Sef-charging batteries have been reworked - * They are now a new item with metadata (legacy ones still work) - * The base form is an empty selfcharger which is filled with two billets of material, i.e. no more upgrade recipes - * There are a few new variants like cobalt-60 and gold-198 - * New selfchargers have a model when plugged into a battery socket - * Selfchargers are a fair bit weaker than their old counterparts, but substantially cheaper too -* Old batteries now have the "LEGACY" tag - -## Fixed -* Fixed the FEnSU, cyclotron and reliant robin missile being uncraftable due to stacksize limitations - * The system for detecting impossible recipe has been improved, instead of a fixed 64 item limit, it now uses the actual limit of the item (or 64 for ore dictionary inputs) -* Fixed yet another issue regarding addon fluids breaking on recipe reload -* Fixed YET ANOTHER issue regarding crates, AGAIN -* Fixed a rare issue where the fusion reactor could have negative fuel -* Fixed battery socket priority tooltip offset -* Fixed enchantability on many armor sets being incorrect - * Most power armors are intended to not be enchantable at all -* Fixed crash caused by the balefire bomb -* Fixed JSON gun reload animations becoming faster and faster with the trenchmaster set -* Fixed heat transfer rate labels on the boilers and coker unit being off by a magnitude of 10 -* Fixed crucible not having a heat transfer rate tooltip -* Fixed certain heliostat mirror rotations not showing the mirror \ No newline at end of file +* Rad absorbers now use metadata, existing blocks will be converted automatically +* Fissure bombs that go off in crater biomes now create fissures with metadata 1 which creates radioactive volcanic lava + * If a crater biome is created on top of an existing fissue, it will keep producing normal volcanic lava \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 6d6a28d89..37b60b711 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_version=1.0.27 # Empty build number makes a release type -mod_build_number=5570 +mod_build_number=5572 credits=HbMinecraft,\ \ rodolphito (explosion algorithms),\ diff --git a/src/main/java/com/hbm/blocks/BlockEnums.java b/src/main/java/com/hbm/blocks/BlockEnums.java index 15a618779..f2cef0da2 100644 --- a/src/main/java/com/hbm/blocks/BlockEnums.java +++ b/src/main/java/com/hbm/blocks/BlockEnums.java @@ -80,4 +80,5 @@ public class BlockEnums { FLUORESCENT, HALOGEN } + } diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 7a4ef7b6f..ecf0b1879 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -1172,10 +1172,11 @@ public class ModBlocks { public static Block gas_explosive; public static Block vacuum; - public static Block absorber; - public static Block absorber_red; - public static Block absorber_green; - public static Block absorber_pink; + @Deprecated public static Block absorber; + @Deprecated public static Block absorber_red; + @Deprecated public static Block absorber_green; + @Deprecated public static Block absorber_pink; + public static Block rad_absorber; public static Block decon; public static Block mud_block; @@ -2333,13 +2334,15 @@ public class ModBlocks { gas_explosive = new BlockGasExplosive().setBlockName("gas_explosive").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":gas_explosive"); vacuum = new BlockVacuum().setBlockName("vacuum").setResistance(1000000F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":vacuum"); - absorber = new BlockAbsorber(Material.iron, 2.5F).setBlockName("absorber").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":absorber"); - absorber_red = new BlockAbsorber(Material.iron, 10F).setBlockName("absorber_red").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":absorber_red"); - absorber_green = new BlockAbsorber(Material.iron, 100F).setBlockName("absorber_green").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":absorber_green"); - absorber_pink = new BlockAbsorber(Material.iron, 10000F).setBlockName("absorber_pink").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":absorber_pink"); + absorber = new BlockGeneric(Material.iron).setBlockName("absorber").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_deprecated"); + absorber_red = new BlockGeneric(Material.iron).setBlockName("absorber_red").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_deprecated"); + absorber_green = new BlockGeneric(Material.iron).setBlockName("absorber_green").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_deprecated"); + absorber_pink = new BlockGeneric(Material.iron).setBlockName("absorber_pink").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_deprecated"); + + rad_absorber = new BlockAbsorber(Material.iron).setBlockName("rad_absorber").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); decon = new BlockDecon(Material.iron).setBlockName("decon").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":decon_side"); - if (Loader.isModLoaded("OpenComputers")) { + if(Loader.isModLoaded("OpenComputers")) { oc_cable_paintable = new BlockOpenComputersCablePaintable().setBlockName("oc_cable_paintable").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); } @@ -3369,6 +3372,7 @@ public class ModBlocks { GameRegistry.registerBlock(absorber_red, absorber_red.getUnlocalizedName()); GameRegistry.registerBlock(absorber_green, absorber_green.getUnlocalizedName()); GameRegistry.registerBlock(absorber_pink, absorber_pink.getUnlocalizedName()); + GameRegistry.registerBlock(rad_absorber, ItemBlockBase.class, rad_absorber.getUnlocalizedName()); GameRegistry.registerBlock(decon, decon.getUnlocalizedName()); //Solar Tower Blocks @@ -3608,15 +3612,15 @@ public class ModBlocks { } // Is this block a special structure handling block, so we can ignore it for blacklist selection, etc. - public static boolean isStructureBlock(Block block, boolean includeAir) { - if(block == null) return false; - if(block == wand_air) return includeAir; + public static boolean isStructureBlock(Block block, boolean includeAir) { + if(block == null) return false; + if(block == wand_air) return includeAir; if(block == wand_structure) return true; - if(block == wand_jigsaw) return true; - if(block == wand_logic) return true; - if(block == wand_tandem) return true; - if(block == wand_loot) return true; - return false; - } + if(block == wand_jigsaw) return true; + if(block == wand_logic) return true; + if(block == wand_tandem) return true; + if(block == wand_loot) return true; + return false; + } } diff --git a/src/main/java/com/hbm/blocks/bomb/BlockFissureBomb.java b/src/main/java/com/hbm/blocks/bomb/BlockFissureBomb.java index ca67eee3a..871c75293 100644 --- a/src/main/java/com/hbm/blocks/bomb/BlockFissureBomb.java +++ b/src/main/java/com/hbm/blocks/bomb/BlockFissureBomb.java @@ -3,6 +3,7 @@ package com.hbm.blocks.bomb; import com.hbm.blocks.ModBlocks; import com.hbm.entity.item.EntityTNTPrimedBase; import com.hbm.explosion.ExplosionNukeSmall; +import com.hbm.world.biome.BiomeGenCraterBase; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -16,6 +17,8 @@ public class BlockFissureBomb extends BlockTNTBase { int range = 5; + boolean crater = world.getBiomeGenForCoords((int) Math.floor(x), (int) Math.floor(z)) instanceof BiomeGenCraterBase; + for(int i = -range; i <= range; i++) { for(int j = -range; j <= range; j++) { for(int k = -range; k <= range; k++) { @@ -27,7 +30,7 @@ public class BlockFissureBomb extends BlockTNTBase { Block block = world.getBlock(a, b, c); if(block == ModBlocks.ore_bedrock) { - world.setBlock(a, b, c, ModBlocks.ore_volcano); + world.setBlock(a, b, c, ModBlocks.ore_volcano, crater ? 1 : 0, 3); } else if(block == ModBlocks.ore_bedrock_oil) { world.setBlock(a, b, c, Blocks.bedrock); } diff --git a/src/main/java/com/hbm/blocks/generic/BlockAbsorber.java b/src/main/java/com/hbm/blocks/generic/BlockAbsorber.java index 0804cc52b..3930de69e 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockAbsorber.java +++ b/src/main/java/com/hbm/blocks/generic/BlockAbsorber.java @@ -2,38 +2,79 @@ package com.hbm.blocks.generic; import java.util.Random; +import com.hbm.blocks.BlockEnumMulti; +import com.hbm.blocks.IBlockMulti; import com.hbm.handler.radiation.ChunkRadiationManager; +import com.hbm.lib.RefStrings; -import net.minecraft.block.Block; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; import net.minecraft.world.World; -public class BlockAbsorber extends Block { +public class BlockAbsorber extends BlockEnumMulti implements IBlockMulti { - float absorb = 0; + // Enum for tiers they are in order of meta data, 0, 1, 2, 3 for Base, Red, Green, Pink + public static enum EnumAbsorberTier { - public BlockAbsorber(Material mat, float ab) { - super(mat); + BASE(2.5F, "absorber"), RED(10F, "absorber_red"), GREEN(100F, "absorber_green"), PINK(10000F, "absorber_pink"); + + public final float absorbAmount; + public final String textureName; + + private EnumAbsorberTier(float absorb, String texture) { + this.absorbAmount = absorb; + this.textureName = texture; + } + } + + public BlockAbsorber(Material mat) { + super(mat, EnumAbsorberTier.class, true, true); this.setTickRandomly(true); - absorb = ab; + this.setBlockName("rad_absorber"); + } + + public EnumAbsorberTier getTier(int meta) { + return EnumAbsorberTier.values()[rectify(meta)]; } @Override - public int tickRate(World world) { + public String getUnlocalizedName(ItemStack stack) { + EnumAbsorberTier tier = getTier(stack.getItemDamage()); + String tierName = net.minecraft.util.StatCollector.translateToLocal("tile.rad_absorber." + tier.name().toLowerCase()); + return tierName; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(net.minecraft.client.renderer.texture.IIconRegister reg) { + icons = new IIcon[EnumAbsorberTier.values().length]; + for(int i = 0; i < icons.length; i++) { + icons[i] = reg.registerIcon(RefStrings.MODID + ":" + EnumAbsorberTier.values()[i].textureName); + } + } + + // All that rad math shit that was on there already, did not touch this + // -Wolf + + @Override + public int tickRate(World world) { return 10; } @Override public void updateTick(World world, int x, int y, int z, Random rand) { - - ChunkRadiationManager.proxy.decrementRad(world, x, y, z, absorb); - world.scheduleBlockUpdate(x, y, z, this, this.tickRate(world)); + EnumAbsorberTier tier = getTier(world.getBlockMetadata(x, y, z)); + ChunkRadiationManager.proxy.decrementRad(world, x, y, z, tier.absorbAmount); + world.scheduleBlockUpdate(x, y, z, this, tickRate(world)); } + @Override public void onBlockAdded(World world, int x, int y, int z) { super.onBlockAdded(world, x, y, z); - - world.scheduleBlockUpdate(x, y, z, this, this.tickRate(world)); + world.scheduleBlockUpdate(x, y, z, this, tickRate(world)); } } diff --git a/src/main/java/com/hbm/blocks/generic/BlockFissure.java b/src/main/java/com/hbm/blocks/generic/BlockFissure.java index 0f1dea15a..0b6904337 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockFissure.java +++ b/src/main/java/com/hbm/blocks/generic/BlockFissure.java @@ -55,7 +55,8 @@ public class BlockFissure extends BlockContainer implements IBlockMultiPass { @Override public void updateTick(World world, int x, int y, int z, Random rand) { - if(world.getBlock(x, y + 1, z).isReplaceable(world, x, y + 1, z)) world.setBlock(x, y + 1, z, ModBlocks.volcanic_lava_block); + boolean crater = world.getBlockMetadata(x, y, z) != 0; + if(world.getBlock(x, y + 1, z).isReplaceable(world, x, y + 1, z)) world.setBlock(x, y + 1, z, crater ? ModBlocks.rad_lava_block : ModBlocks.volcanic_lava_block); } @Override diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java index 2a9c16c95..5d775ed67 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java @@ -462,7 +462,7 @@ public class AssemblyMachineRecipes extends GenericRecipes { // accelerators this.register(new GenericRecipe("ass.cyclotron").setup(600, 100).outputItems(new ItemStack(ModBlocks.machine_cyclotron, 1)) - .inputItems(new ComparableStack(ModItems.battery_pack, 1, EnumBatteryPack.BATTERY_LITHIUM), new OreDictStack(ND.wireDense(), 32), new OreDictStack(STEEL.ingot(), 16), new OreDictStack(STEEL.plate(), 32), new OreDictStack(AL.plate(), 32), new OreDictStack(ANY_PLASTIC.ingot(), 24), new OreDictStack(RUBBER.ingot(), 24), new OreDictStack(CU.plateCast(), 8), new ComparableStack(ModItems.circuit, 16, EnumCircuitType.BASIC)) + .inputItems(new ComparableStack(ModItems.battery_pack, 1, EnumBatteryPack.BATTERY_LITHIUM), new OreDictStack(ND.wireDense(), 32), new OreDictStack(STEEL.plateCast(), 16), new OreDictStack(ANY_PLASTIC.ingot(), 24), new OreDictStack(RUBBER.ingot(), 24), new ComparableStack(ModItems.circuit, 16, EnumCircuitType.BASIC)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 8, EnumExpensiveType.FERRO_PLATING), new OreDictStack(ND.wireDense(), 32), new OreDictStack(AL.plateWelded(), 16), new OreDictStack(RUBBER.ingot(), 32), new ComparableStack(ModItems.item_expensive, 8, EnumExpensiveType.CIRCUIT))); this.register(new GenericRecipe("ass.beamline").setup(200, 100).outputItems(new ItemStack(ModBlocks.pa_beamline, 1)) .inputItems(new OreDictStack(STEEL.plateCast(), 8), new OreDictStack(CU.plate(), 16), new OreDictStack(GOLD.wireDense(), 4)) @@ -661,7 +661,7 @@ public class AssemblyMachineRecipes extends GenericRecipes { } // rancid shit mob spawners - this.register(new GenericRecipe("ass.chopper").setup(1_200, 100).outputItems(new ItemStack(ModItems.spawn_chopper, 8)) + this.register(new GenericRecipe("ass.chopper").setup(1_200, 100).outputItems(new ItemStack(ModItems.spawn_chopper, 1)) .inputItems(new OreDictStack(CMB.plateCast(), 24), new OreDictStack(STEEL.plate(), 32), new OreDictStack(MAGTUNG.wireFine(), 48), new ComparableStack(ModItems.motor_desh, 5), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.CONTROLLER_ADVANCED))); this.register(new GenericRecipe("ass.ballsotron").setup(1_200, 100).outputItems(new ItemStack(ModItems.spawn_worm, 1)) .inputItems(new OreDictStack(TI.plateWelded(), 32), new OreDictStack(RUBBER.ingot(), 64), new ComparableStack(ModItems.motor, 64), new OreDictStack(GOLD.wireDense(), 64), new OreDictStack(U238.block(), 10), new ComparableStack(ModItems.mech_key, 1))); diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 4ddd719ed..540dd0807 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (5570)"; + public static final String VERSION = "1.0.27 BETA (5572)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 47e9829bb..b2979013e 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -3,6 +3,7 @@ package com.hbm.main; import com.hbm.blocks.BlockEnums.DecoCabinetEnum; import com.hbm.blocks.BlockEnums.LightstoneType; import com.hbm.blocks.ModBlocks; +import com.hbm.blocks.generic.BlockAbsorber.EnumAbsorberTier; import com.hbm.blocks.generic.BlockConcreteColoredExt.EnumConcreteType; import com.hbm.blocks.generic.BlockGenericStairs; import com.hbm.blocks.generic.BlockMultiSlab; @@ -643,11 +644,11 @@ 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.decon, 1), new Object[] { "BGB", "SAS", "BSB", 'B', BE.ingot(), 'G', Blocks.iron_bars, 'S', STEEL.ingot(), 'A', ModBlocks.absorber }); + 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', new ItemStack(ModBlocks.rad_absorber, 1, EnumAbsorberTier.BASE.ordinal()) }); 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/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 6e3394ca5..3fcba2731 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -3858,10 +3858,15 @@ stat.ntmBullets=Schüsse gefeuert stat.ntmLegendary=Legendäre Gegenstände hergestellt stat.ntmMines=Auf Minen getreten -tile.absorber.name=Strahlungs-Absorber -tile.absorber_green.name=Fortgeschrittener Strahlungs-Absorber -tile.absorber_pink.name=Elite Strahlungs-Absorber -tile.absorber_red.name=Verbesserter Strahlungs-Absorber +tile.absorber.name=Strahlungs-Absorber OLD +tile.absorber_green.name=Fortgeschrittener Strahlungs-Absorber OLD +tile.absorber_pink.name=Elite Strahlungs-Absorber OLD +tile.absorber_red.name=Verbesserter Strahlungs-Absorber OLD + +tile.rad_absorber.base.name=Strahlungs-Absorber +tile.rad_absorber.red.name=Fortgeschrittener Strahlungs-Absorber +tile.rad_absorber.green.name=Elite Strahlungs-Absorber +tile.rad_absorber.pink.name=Verbesserter Strahlungs-Absorber tile.acid_block.name=Säure tile.ams_base.name=AMS-Basis (Deko) tile.ams_emitter.name=AMS-Emitter (Deko) diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 32007905e..8ae095078 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -5069,10 +5069,15 @@ stat.ntmBullets=Rounds Fired stat.ntmLegendary=Legendary Items Created stat.ntmMines=Mines Stepped on -tile.absorber.name=Radiation Absorber -tile.absorber_green.name=Advanced Radiation Absorber -tile.absorber_pink.name=Elite Radiation Absorber -tile.absorber_red.name=Enhanced Radiation Absorber +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.green.name=Advanced Radiation Absorber +tile.rad_absorber.pink.name=Elite Radiation Absorber +tile.rad_absorber.red.name=Enhanced Radiation Absorber tile.acid_block.name=Acid tile.ams_base.name=AMS Base (Deco) tile.ams_emitter.name=AMS Emitter (Deco) diff --git a/src/main/resources/assets/hbm/lang/it_IT.lang b/src/main/resources/assets/hbm/lang/it_IT.lang index 5461f533f..0c88a5416 100644 --- a/src/main/resources/assets/hbm/lang/it_IT.lang +++ b/src/main/resources/assets/hbm/lang/it_IT.lang @@ -4833,10 +4833,15 @@ shape.wiresDense=Dense Wires soundCategory.ntmMachines=NTM Machines -tile.absorber.name=Radiation Absorber -tile.absorber_green.name=Advanced Radiation Absorber -tile.absorber_pink.name=Elite Radiation Absorber -tile.absorber_red.name=Enhanced Radiation Absorber +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.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.acid_block.name=Acid tile.ams_base.name=AMS Base (Deco) tile.ams_emitter.name=AMS Emitter (Deco) diff --git a/src/main/resources/assets/hbm/lang/pl_PL.lang b/src/main/resources/assets/hbm/lang/pl_PL.lang index 742614376..25df53a31 100644 --- a/src/main/resources/assets/hbm/lang/pl_PL.lang +++ b/src/main/resources/assets/hbm/lang/pl_PL.lang @@ -4308,10 +4308,15 @@ shape.wire=Wire soundCategory.ntmMachines=NTM Machines -tile.absorber.name=Radiation Absorber -tile.absorber_green.name=Advanced Radiation Absorber -tile.absorber_pink.name=Elite Radiation Absorber -tile.absorber_red.name=Enhanced Radiation Absorber +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.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.acid_block.name=Acid tile.ams_base.name=AMS Base (Dekoracja) tile.ams_emitter.name=AMS Emitter (Dekoracja) diff --git a/src/main/resources/assets/hbm/lang/ru_RU.lang b/src/main/resources/assets/hbm/lang/ru_RU.lang index 5826cb8cf..bf2062096 100644 --- a/src/main/resources/assets/hbm/lang/ru_RU.lang +++ b/src/main/resources/assets/hbm/lang/ru_RU.lang @@ -5334,10 +5334,15 @@ stat.ntmBullets=Сделано выстрелов stat.ntmLegendary=Создано легендарных предметов stat.ntmMines=Подрывов на минах -tile.absorber.name=Поглотитель радиации -tile.absorber_green.name=Усовершенствованный поглотитель радиации -tile.absorber_pink.name=Элитный поглотитель радиации -tile.absorber_red.name=Продвинутый поглотитель радиации +tile.absorber.name=Поглотитель радиации OLD +tile.absorber_green.name=Усовершенствованный поглотитель радиации OLD +tile.absorber_pink.name=Элитный поглотитель радиации OLD +tile.absorber_red.name=Продвинутый поглотитель радиации OLD + +tile.rad_absorber.base.name=Поглотитель радиации +tile.rad_absorber.red.name=Усовершенствованный поглотитель радиации +tile.rad_absorber.green.name=Элитный поглотитель радиации +tile.rad_absorber.pink.name=Продвинутый поглотитель радиации tile.acid_block.name=Кислота tile.ams_base.name=Основание АМС [Декор] tile.ams_emitter.name=Излучатель АМС [Декор] diff --git a/src/main/resources/assets/hbm/lang/uk_UA.lang b/src/main/resources/assets/hbm/lang/uk_UA.lang index 71239aef1..33140170e 100644 --- a/src/main/resources/assets/hbm/lang/uk_UA.lang +++ b/src/main/resources/assets/hbm/lang/uk_UA.lang @@ -4873,10 +4873,15 @@ stat.ntmBullets=Випущено набоїв stat.ntmLegendary=Створено легендарних предметів stat.ntmMines=Підривів на мінах -tile.absorber.name=Поглинач радіації -tile.absorber_green.name=Удосконалений поглинач радіації -tile.absorber_pink.name=Елітний поглинач радіації -tile.absorber_red.name=Покращений поглинач радіації +tile.absorber.name=Поглинач радіації OLD +tile.absorber_green.name=Удосконалений поглинач радіації OLD +tile.absorber_pink.name=Елітний поглинач радіації OLD +tile.absorber_red.name=Покращений поглинач радіації OLD + +tile.rad_absorber.base.name=Поглинач радіації +tile.rad_absorber.red.name=Удосконалений поглинач радіації +tile.rad_absorber.green.name=Елітний поглинач радіації +tile.rad_absorber.pink.name=Покращений поглинач радіації tile.acid_block.name=Кислота tile.ams_base.name=AMS Base (Deco) tile.ams_emitter.name=AMS Emitter (Deco) diff --git a/src/main/resources/assets/hbm/lang/zh_CN.lang b/src/main/resources/assets/hbm/lang/zh_CN.lang index fb1f9ea78..e59a7a9de 100644 --- a/src/main/resources/assets/hbm/lang/zh_CN.lang +++ b/src/main/resources/assets/hbm/lang/zh_CN.lang @@ -4516,10 +4516,16 @@ shape.wireFine=线 shape.wireDense=致密线 shape.wiresDense=致密线 soundCategory.ntmMachines=NTM机器 -tile.absorber.name=辐射吸收器 -tile.absorber_green.name=高级辐射吸收器 -tile.absorber_pink.name=精英辐射吸收器 -tile.absorber_red.name=增强型辐射吸收器 + +tile.absorber.name=辐射吸收器 OLD +tile.absorber_green.name=高级辐射吸收器 OLD +tile.absorber_pink.name=精英辐射吸收器 OLD +tile.absorber_red.name=增强型辐射吸收器 OLD + +tile.rad_absorber.base.name=辐射吸收器 +tile.rad_absorber.red.name=高级辐射吸收器 +tile.rad_absorber.green.name=精英辐射吸收器 +tile.rad_absorber.pink.name=增强型辐射吸收器 tile.acid_block.name=酸 tile.ams_base.name=AMS基座 [开发中] tile.ams_emitter.name=AMS发射极 [开发中]