diff --git a/src/main/java/api/hbm/item/IDepthRockTool.java b/src/main/java/api/hbm/item/IDepthRockTool.java new file mode 100644 index 000000000..1320dafa8 --- /dev/null +++ b/src/main/java/api/hbm/item/IDepthRockTool.java @@ -0,0 +1,11 @@ +package api.hbm.item; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public interface IDepthRockTool { + + public boolean canBreakRock(World world, EntityPlayer player, ItemStack tool, Block block, int x, int y, int z); +} diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 9c7718374..212e18b56 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -105,6 +105,10 @@ public class ModBlocks { public static Block ore_gneiss_schrabidium; public static Block ore_gneiss_rare; public static Block ore_gneiss_gas; + + public static Block gneiss_brick; + public static Block gneiss_tile; + public static Block gneiss_chiseled; public static Block stone_depth; public static Block ore_depth_cinnebar; @@ -112,6 +116,12 @@ public class ModBlocks { public static Block cluster_depth_iron; public static Block cluster_depth_titanium; public static Block cluster_depth_tungsten; + + public static Block stone_depth_nether; + public static Block ore_depth_nether_neodymium; + + public static Block depth_brick; + public static Block depth_tiles; public static Block cluster_iron; public static Block cluster_titanium; @@ -203,6 +213,7 @@ public class ModBlocks { public static Block block_actinium; public static Block block_tritium; public static Block block_semtex; + public static Block block_smore; public static Block block_australium; public static Block block_weidanium; @@ -957,6 +968,8 @@ public class ModBlocks { public static final int guiID_rbmk_console = 117; public static final int guiID_rbmk_outgasser = 119; public static Block rbmk_loader; + public static Block rbmk_steam_inlet; + public static Block rbmk_steam_outlet; public static Block pribris; public static Block pribris_burning; public static Block pribris_radiating; @@ -1126,7 +1139,7 @@ public class ModBlocks { cluster_titanium = new BlockCluster(Material.rock).setBlockName("cluster_titanium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":cluster_titanium"); cluster_aluminium = new BlockCluster(Material.rock).setBlockName("cluster_aluminium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":cluster_aluminium"); - ore_nether_coal = new BlockNetherCoal(Material.rock, true, 5, true).setBlockName("ore_nether_coal").setCreativeTab(MainRegistry.blockTab).setLightLevel(10F/15F).setHardness(0.4F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_coal"); + ore_nether_coal = new BlockNetherCoal(Material.rock, false, 5, true).setBlockName("ore_nether_coal").setCreativeTab(MainRegistry.blockTab).setLightLevel(10F/15F).setHardness(0.4F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_coal"); ore_nether_smoldering = new BlockSmolder(Material.rock).setBlockName("ore_nether_smoldering").setCreativeTab(MainRegistry.blockTab).setLightLevel(1F).setHardness(0.4F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_smoldering"); ore_nether_uranium = new BlockOutgas(Material.rock, true, 5, false).setBlockName("ore_nether_uranium").setCreativeTab(MainRegistry.blockTab).setHardness(0.4F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_uranium"); ore_nether_uranium_scorched = new BlockOutgas(Material.rock, true, 5, false).setBlockName("ore_nether_uranium_scorched").setCreativeTab(MainRegistry.blockTab).setHardness(0.4F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_uranium_scorched"); @@ -1159,13 +1172,23 @@ public class ModBlocks { ore_gneiss_schrabidium = new BlockOre(Material.rock).setBlockName("ore_gneiss_schrabidium").setCreativeTab(MainRegistry.blockTab).setHardness(1.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_gneiss_schrabidium"); ore_gneiss_rare = new BlockOre(Material.rock).setBlockName("ore_gneiss_rare").setCreativeTab(MainRegistry.blockTab).setHardness(1.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_gneiss_rare"); ore_gneiss_gas = new BlockOre(Material.rock).setBlockName("ore_gneiss_gas").setCreativeTab(MainRegistry.blockTab).setHardness(1.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_gneiss_gas"); + + gneiss_brick = new BlockGeneric(Material.rock).setBlockName("gneiss_brick").setCreativeTab(MainRegistry.blockTab).setHardness(1.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":gneiss_brick"); + gneiss_tile = new BlockGeneric(Material.rock).setBlockName("gneiss_tile").setCreativeTab(MainRegistry.blockTab).setHardness(1.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":gneiss_tile"); + gneiss_chiseled = new BlockPillar(Material.rock, RefStrings.MODID + ":gneiss_tile").setBlockName("gneiss_chiseled").setCreativeTab(MainRegistry.blockTab).setHardness(1.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":gneiss_chiseled"); - stone_depth = new BlockGeneric(Material.rock).setBlockName("stone_depth").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":stone_depth"); + stone_depth = new BlockDepth().setBlockName("stone_depth").setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":stone_depth"); ore_depth_cinnebar = new BlockOre(Material.rock).setBlockName("ore_depth_cinnebar").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_depth_cinnebar"); ore_depth_zirconium = new BlockOre(Material.rock).setBlockName("ore_depth_zirconium").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_depth_zirconium"); cluster_depth_iron = new BlockOre(Material.rock).setBlockName("cluster_depth_iron").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":cluster_depth_iron"); cluster_depth_titanium = new BlockOre(Material.rock).setBlockName("cluster_depth_titanium").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":cluster_depth_titanium"); cluster_depth_tungsten = new BlockOre(Material.rock).setBlockName("cluster_depth_tungsten").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":cluster_depth_tungsten"); + + depth_brick = new BlockGeneric(Material.rock).setBlockName("depth_brick").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":depth_brick"); + depth_tiles = new BlockGeneric(Material.rock).setBlockName("depth_tiles").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":depth_tiles"); + + stone_depth_nether = new BlockDepth().setBlockName("stone_depth_nether").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":stone_depth_nether"); + ore_depth_nether_neodymium = new BlockOre(Material.rock).setBlockName("ore_depth_nether_neodymium").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_depth_nether_neodymium"); ore_australium = new BlockGeneric(Material.rock).setBlockName("ore_australium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_australium"); ore_weidanium = new BlockGeneric(Material.rock).setBlockName("ore_weidanium").setCreativeTab(null).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_weidanium"); @@ -1260,7 +1283,8 @@ public class ModBlocks { block_actinium = new BlockGeneric(Material.iron).setBlockName("block_actinium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_actinium"); block_tritium = new BlockRotatablePillar(Material.glass, RefStrings.MODID + ":block_tritium_top").setBlockName("block_tritium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGlass).setHardness(3.0F).setResistance(2.0F).setBlockTextureName(RefStrings.MODID + ":block_tritium_side"); block_semtex = new BlockSemtex(Material.tnt).setBlockName("block_semtex").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(2.0F).setResistance(2.0F).setBlockTextureName(RefStrings.MODID + ":block_semtex"); - + block_smore = new BlockPillar(Material.rock, RefStrings.MODID + ":block_smore_top").setBlockName("block_smore").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(900.0F).setBlockTextureName(RefStrings.MODID + ":block_smore_side"); + block_australium = new BlockGeneric(Material.iron).setBlockName("block_australium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_australium"); block_weidanium = new BlockGeneric(Material.iron).setBlockName("block_weidanium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_weidanium"); block_reiium = new BlockGeneric(Material.iron).setBlockName("block_reiium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_reiium"); @@ -1323,7 +1347,7 @@ public class ModBlocks { brick_compound = new BlockGeneric(Material.rock).setBlockName("brick_compound").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(10000.0F).setBlockTextureName(RefStrings.MODID + ":brick_compound"); cmb_brick = new BlockGeneric(Material.rock).setBlockName("cmb_brick").setCreativeTab(MainRegistry.blockTab).setHardness(25.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":cmb_brick"); cmb_brick_reinforced = new BlockGeneric(Material.rock).setBlockName("cmb_brick_reinforced").setCreativeTab(MainRegistry.blockTab).setHardness(25.0F).setResistance(60000.0F).setBlockTextureName(RefStrings.MODID + ":cmb_brick_reinforced"); - brick_asbestos = new BlockOutgas(Material.rock, true, 5, true).addAsbestos().toBlock().setBlockName("brick_asbestos").setCreativeTab(MainRegistry.blockTab).setResistance(1000.0F).setBlockTextureName(RefStrings.MODID + ":brick_asbestos"); + brick_asbestos = new BlockOutgas(Material.rock, true, 5, true).addAsbestos().toBlock().setBlockName("brick_asbestos").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(1000.0F).setBlockTextureName(RefStrings.MODID + ":brick_asbestos"); tile_lab = new BlockOutgas(Material.rock, false, 5, true).setBlockName("tile_lab").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(1.0F).setResistance(20.0F).setBlockTextureName(RefStrings.MODID + ":tile_lab"); tile_lab_cracked = new BlockOutgas(Material.rock, false, 5, true).setBlockName("tile_lab_cracked").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(1.0F).setResistance(20.0F).setBlockTextureName(RefStrings.MODID + ":tile_lab_cracked"); @@ -1773,6 +1797,8 @@ public class ModBlocks { rbmk_outgasser = new RBMKOutgasser().setBlockName("rbmk_outgasser").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":rbmk/rbmk_outgasser"); rbmk_console = new RBMKConsole().setBlockName("rbmk_console").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":rbmk/rbmk_console"); rbmk_loader = new BlockGeneric(Material.iron).setBlockName("rbmk_loader").setCreativeTab(MainRegistry.machineTab).setHardness(50.0F).setResistance(60.0F).setBlockTextureName(RefStrings.MODID + ":rbmk_loader"); + rbmk_steam_inlet = new RBMKInlet(Material.iron).setBlockName("rbmk_steam_inlet").setCreativeTab(MainRegistry.machineTab).setHardness(50.0F).setResistance(60.0F).setBlockTextureName(RefStrings.MODID + ":rbmk_steam_inlet"); + rbmk_steam_outlet = new RBMKOutlet(Material.iron).setBlockName("rbmk_steam_outlet").setCreativeTab(MainRegistry.machineTab).setHardness(50.0F).setResistance(60.0F).setBlockTextureName(RefStrings.MODID + ":rbmk_steam_outlet"); pribris = new RBMKDebris().setBlockName("pribris").setCreativeTab(MainRegistry.machineTab).setHardness(50.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":rbmk/rbmk_debris"); pribris_burning = new RBMKDebrisBurning().setBlockName("pribris_burning").setCreativeTab(MainRegistry.machineTab).setHardness(50.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":rbmk/rbmk_debris_burning"); pribris_radiating = new RBMKDebrisRadiating().setBlockName("pribris_radiating").setCreativeTab(MainRegistry.machineTab).setHardness(50.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":rbmk/rbmk_debris_radiating"); @@ -2066,6 +2092,9 @@ public class ModBlocks { GameRegistry.registerBlock(cluster_depth_titanium, ItemBlockDepth.class, cluster_depth_titanium.getUnlocalizedName()); GameRegistry.registerBlock(cluster_depth_tungsten, ItemBlockDepth.class, cluster_depth_tungsten.getUnlocalizedName()); + //Nether depth ores + GameRegistry.registerBlock(ore_depth_nether_neodymium, ItemBlockDepth.class, ore_depth_nether_neodymium.getUnlocalizedName()); + //End Ores GameRegistry.registerBlock(ore_tikite, ore_tikite.getUnlocalizedName()); @@ -2077,7 +2106,13 @@ public class ModBlocks { //Stone Variants GameRegistry.registerBlock(stone_gneiss, stone_gneiss.getUnlocalizedName()); + GameRegistry.registerBlock(gneiss_brick, gneiss_brick.getUnlocalizedName()); + GameRegistry.registerBlock(gneiss_tile, gneiss_tile.getUnlocalizedName()); + GameRegistry.registerBlock(gneiss_chiseled, gneiss_chiseled.getUnlocalizedName()); GameRegistry.registerBlock(stone_depth, ItemBlockDepth.class, stone_depth.getUnlocalizedName()); + GameRegistry.registerBlock(depth_brick, ItemBlockDepth.class, depth_brick.getUnlocalizedName()); + GameRegistry.registerBlock(depth_tiles, ItemBlockDepth.class, depth_tiles.getUnlocalizedName()); + GameRegistry.registerBlock(stone_depth_nether, ItemBlockDepth.class, stone_depth_nether.getUnlocalizedName()); //Blocks GameRegistry.registerBlock(block_uranium, ItemBlockHazard.class, block_uranium.getUnlocalizedName()); @@ -2157,6 +2192,7 @@ public class ModBlocks { GameRegistry.registerBlock(block_actinium, block_actinium.getUnlocalizedName()); GameRegistry.registerBlock(block_tritium, block_tritium.getUnlocalizedName()); GameRegistry.registerBlock(block_semtex, block_semtex.getUnlocalizedName()); + GameRegistry.registerBlock(block_smore, block_smore.getUnlocalizedName()); //Bottlecap Blocks GameRegistry.registerBlock(block_cap_nuka, block_cap_nuka.getUnlocalizedName()); @@ -2542,6 +2578,8 @@ public class ModBlocks { GameRegistry.registerBlock(rbmk_outgasser, rbmk_outgasser.getUnlocalizedName()); GameRegistry.registerBlock(rbmk_console, rbmk_console.getUnlocalizedName()); GameRegistry.registerBlock(rbmk_loader, rbmk_loader.getUnlocalizedName()); + GameRegistry.registerBlock(rbmk_steam_inlet, rbmk_steam_inlet.getUnlocalizedName()); + GameRegistry.registerBlock(rbmk_steam_outlet, rbmk_steam_outlet.getUnlocalizedName()); GameRegistry.registerBlock(pribris, pribris.getUnlocalizedName()); GameRegistry.registerBlock(pribris_burning, pribris_burning.getUnlocalizedName()); GameRegistry.registerBlock(pribris_radiating, pribris_radiating.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/gas/BlockGasAsbestos.java b/src/main/java/com/hbm/blocks/gas/BlockGasAsbestos.java index 3ebbeb74a..1f2a3c61a 100644 --- a/src/main/java/com/hbm/blocks/gas/BlockGasAsbestos.java +++ b/src/main/java/com/hbm/blocks/gas/BlockGasAsbestos.java @@ -15,6 +15,10 @@ import net.minecraftforge.common.util.ForgeDirection; public class BlockGasAsbestos extends BlockGasBase { + public BlockGasAsbestos() { + super(0.6F, 0.6F, 0.5F); + } + @Override @SideOnly(Side.CLIENT) public void randomDisplayTick(World world, int x, int y, int z, Random rand) { diff --git a/src/main/java/com/hbm/blocks/gas/BlockGasBase.java b/src/main/java/com/hbm/blocks/gas/BlockGasBase.java index b85737338..43a306262 100644 --- a/src/main/java/com/hbm/blocks/gas/BlockGasBase.java +++ b/src/main/java/com/hbm/blocks/gas/BlockGasBase.java @@ -3,24 +3,36 @@ package com.hbm.blocks.gas; import java.util.Random; import com.hbm.blocks.ModBlocks; +import com.hbm.items.ModItems; +import com.hbm.main.MainRegistry; +import com.hbm.util.ArmorUtil; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; public abstract class BlockGasBase extends Block { + + float red; + float green; + float blue; - public BlockGasBase() { + public BlockGasBase(float r, float g, float b) { super(ModBlocks.materialGas); this.setHardness(0.0F); this.setResistance(0.0F); this.lightOpacity = 0; + this.red = r; + this.green = g; + this.blue = b; } @Override @@ -109,4 +121,24 @@ public abstract class BlockGasBase extends Block { public ForgeDirection randomHorizontal(World world) { return ForgeDirection.getOrientation(world.rand.nextInt(4) + 2); } + + @Override + @SideOnly(Side.CLIENT) + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + super.randomDisplayTick(world, x, y, z, rand); + + EntityPlayer p = MainRegistry.proxy.me(); + if(ArmorUtil.checkArmorPiece(p, ModItems.ashglasses, 3)) { + NBTTagCompound data = new NBTTagCompound(); + data.setString("type", "vanillaExt"); + data.setString("mode", "cloud"); + data.setDouble("posX", x + 0.5); + data.setDouble("posY", y + 0.5); + data.setDouble("posZ", z + 0.5); + data.setFloat("r", red); + data.setFloat("g", green); + data.setFloat("b", blue); + MainRegistry.proxy.effectNT(data); + } + } } diff --git a/src/main/java/com/hbm/blocks/gas/BlockGasClorine.java b/src/main/java/com/hbm/blocks/gas/BlockGasClorine.java index ba3d0fc21..a16bf2ab9 100644 --- a/src/main/java/com/hbm/blocks/gas/BlockGasClorine.java +++ b/src/main/java/com/hbm/blocks/gas/BlockGasClorine.java @@ -1,6 +1,5 @@ package com.hbm.blocks.gas; - import java.util.Random; import com.hbm.util.ArmorUtil; @@ -18,6 +17,10 @@ import net.minecraftforge.common.util.ForgeDirection; public class BlockGasClorine extends BlockGasBase { + public BlockGasClorine() { + super(0.7F, 0.8F, 0.6F); + } + @Override public int getRenderType() { return 0; diff --git a/src/main/java/com/hbm/blocks/gas/BlockGasFlammable.java b/src/main/java/com/hbm/blocks/gas/BlockGasFlammable.java index b73030f0d..18d119759 100644 --- a/src/main/java/com/hbm/blocks/gas/BlockGasFlammable.java +++ b/src/main/java/com/hbm/blocks/gas/BlockGasFlammable.java @@ -11,6 +11,10 @@ import net.minecraftforge.common.util.ForgeDirection; public class BlockGasFlammable extends BlockGasBase { + public BlockGasFlammable() { + super(0.8F, 0.8F, 0.2F); + } + @Override public ForgeDirection getFirstDirection(World world, int x, int y, int z) { diff --git a/src/main/java/com/hbm/blocks/gas/BlockGasMonoxide.java b/src/main/java/com/hbm/blocks/gas/BlockGasMonoxide.java index 204ff06fc..f0cf4dc22 100644 --- a/src/main/java/com/hbm/blocks/gas/BlockGasMonoxide.java +++ b/src/main/java/com/hbm/blocks/gas/BlockGasMonoxide.java @@ -14,6 +14,10 @@ import net.minecraftforge.common.util.ForgeDirection; public class BlockGasMonoxide extends BlockGasBase { + public BlockGasMonoxide() { + super(0.1F, 0.1F, 0.1F); + } + @Override public void onEntityCollidedWithBlock(World world, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity entity) { diff --git a/src/main/java/com/hbm/blocks/gas/BlockGasRadon.java b/src/main/java/com/hbm/blocks/gas/BlockGasRadon.java index 765e91899..fc584b29f 100644 --- a/src/main/java/com/hbm/blocks/gas/BlockGasRadon.java +++ b/src/main/java/com/hbm/blocks/gas/BlockGasRadon.java @@ -15,6 +15,10 @@ import net.minecraftforge.common.util.ForgeDirection; public class BlockGasRadon extends BlockGasBase { + public BlockGasRadon() { + super(0.1F, 0.8F, 0.1F); + } + @Override public void onEntityCollidedWithBlock(World world, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity entity) { diff --git a/src/main/java/com/hbm/blocks/gas/BlockGasRadonDense.java b/src/main/java/com/hbm/blocks/gas/BlockGasRadonDense.java index 3a4d784aa..073f43bc4 100644 --- a/src/main/java/com/hbm/blocks/gas/BlockGasRadonDense.java +++ b/src/main/java/com/hbm/blocks/gas/BlockGasRadonDense.java @@ -19,6 +19,10 @@ import net.minecraftforge.common.util.ForgeDirection; public class BlockGasRadonDense extends BlockGasBase { + public BlockGasRadonDense() { + super(0.1F, 0.5F, 0.1F); + } + @Override public void onEntityCollidedWithBlock(World world, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity entity) { diff --git a/src/main/java/com/hbm/blocks/gas/BlockGasRadonTomb.java b/src/main/java/com/hbm/blocks/gas/BlockGasRadonTomb.java index 1cfdfa381..308c4ea23 100644 --- a/src/main/java/com/hbm/blocks/gas/BlockGasRadonTomb.java +++ b/src/main/java/com/hbm/blocks/gas/BlockGasRadonTomb.java @@ -7,6 +7,8 @@ import com.hbm.util.ContaminationUtil; import com.hbm.util.ContaminationUtil.ContaminationType; import com.hbm.util.ContaminationUtil.HazardType; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; @@ -41,6 +43,10 @@ public class BlockGasRadonTomb extends BlockGasBase { * Leave this place and never come back. */ + public BlockGasRadonTomb() { + super(0.1F, 0.3F, 0.1F); + } + @Override public void onEntityCollidedWithBlock(World world, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity entity) { @@ -69,8 +75,17 @@ public class BlockGasRadonTomb extends BlockGasBase { if(!world.isRemote) { if(rand.nextInt(10) == 0) { - if(world.getBlock(x, y - 1, z) == Blocks.grass) - world.setBlock(x, y - 1, z, ModBlocks.waste_earth); + Block b = world.getBlock(x, y - 1, z); + + if(b == Blocks.grass) { + if(rand.nextInt(5) == 0) + world.setBlock(x, y - 1, z, Blocks.dirt, 1, 3); + else + world.setBlock(x, y - 1, z, ModBlocks.waste_earth); + } + + if((b.getMaterial() == Material.grass || b.getMaterial() == Material.leaves || b.getMaterial() == Material.plants || b.getMaterial() == Material.vine) && !b.isNormalCube()) + world.setBlock(x, y - 1, z, Blocks.air); } if(rand.nextInt(600) == 0) { diff --git a/src/main/java/com/hbm/blocks/generic/BlockDepth.java b/src/main/java/com/hbm/blocks/generic/BlockDepth.java new file mode 100644 index 000000000..e53de9594 --- /dev/null +++ b/src/main/java/com/hbm/blocks/generic/BlockDepth.java @@ -0,0 +1,28 @@ +package com.hbm.blocks.generic; + +import api.hbm.item.IDepthRockTool; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + +public class BlockDepth extends Block { + + public BlockDepth() { + super(Material.rock); + this.setBlockUnbreakable(); + this.setResistance(10.0F); + } + + @Override + public float getPlayerRelativeBlockHardness(EntityPlayer player, World world, int x, int y, int z) { + + if(player.getHeldItem() != null && player.getHeldItem().getItem() instanceof IDepthRockTool) { + + if(((IDepthRockTool)player.getHeldItem().getItem()).canBreakRock(world, player, player.getHeldItem(), this, x, y, z)) + return (float) (1D / 100D); + } + + return super.getPlayerRelativeBlockHardness(player, world, x, y, z); + } +} \ No newline at end of file diff --git a/src/main/java/com/hbm/blocks/generic/BlockOre.java b/src/main/java/com/hbm/blocks/generic/BlockOre.java index b9f933c8b..8e06a9841 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockOre.java +++ b/src/main/java/com/hbm/blocks/generic/BlockOre.java @@ -219,6 +219,9 @@ public class BlockOre extends Block { if(this == ModBlocks.ore_cobalt || this == ModBlocks.ore_nether_cobalt) { return ModItems.fragment_cobalt; } + if(this == ModBlocks.ore_depth_nether_neodymium) { + return ModItems.fragment_neodymium; + } return Item.getItemFromBlock(this); } @@ -255,6 +258,9 @@ public class BlockOre extends Block { if(this == ModBlocks.ore_nether_cobalt) { return 5 + rand.nextInt(8); } + if(this == ModBlocks.ore_depth_nether_neodymium) { + return 2 + rand.nextInt(2); + } return 1; } diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKDebrisRadiating.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKDebrisRadiating.java index cab085852..86e210570 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKDebrisRadiating.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKDebrisRadiating.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Random; import com.hbm.blocks.ModBlocks; +import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; @@ -13,6 +14,7 @@ import com.hbm.util.ContaminationUtil.HazardType; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; @@ -98,9 +100,13 @@ public class RBMKDebrisRadiating extends RBMKDebrisBurning { e.attackEntityFrom(DamageSource.inFire, 100); } - /*if(e instanceof EntityPlayer) { - ((EntityPlayer) e).addChatComponentMessage(new ChatComponentText("RAD/s: " + (int)eRads).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); - }*/ + if(e instanceof EntityPlayer && len < 10) { + EntityPlayer p = (EntityPlayer) e; + + if(p.getHeldItem() != null && p.getHeldItem().getItem() == ModItems.marshmallow && p.getHeldItem().getItemDamage() != 1 && p.getRNG().nextInt(100) == 0) { + p.getHeldItem().setItemDamage(1); + } + } } } } diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKInlet.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKInlet.java new file mode 100644 index 000000000..7fbc50e7d --- /dev/null +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKInlet.java @@ -0,0 +1,20 @@ +package com.hbm.blocks.machine.rbmk; + +import com.hbm.tileentity.machine.rbmk.TileEntityRBMKInlet; + +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class RBMKInlet extends BlockContainer { + + public RBMKInlet(Material mat) { + super(mat); + } + + @Override + public TileEntity createNewTileEntity(World world, int meta) { + return new TileEntityRBMKInlet(); + } +} diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKOutlet.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKOutlet.java new file mode 100644 index 000000000..9a30ea035 --- /dev/null +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKOutlet.java @@ -0,0 +1,20 @@ +package com.hbm.blocks.machine.rbmk; + +import com.hbm.tileentity.machine.rbmk.TileEntityRBMKOutlet; + +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class RBMKOutlet extends BlockContainer { + + public RBMKOutlet(Material mat) { + super(mat); + } + + @Override + public TileEntity createNewTileEntity(World world, int meta) { + return new TileEntityRBMKOutlet(); + } +} diff --git a/src/main/java/com/hbm/crafting/ConsumableRecipes.java b/src/main/java/com/hbm/crafting/ConsumableRecipes.java index f49277fd0..85e6c5e13 100644 --- a/src/main/java/com/hbm/crafting/ConsumableRecipes.java +++ b/src/main/java/com/hbm/crafting/ConsumableRecipes.java @@ -53,6 +53,7 @@ public class ConsumableRecipes { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.loop_stew), new Object[] { ModItems.loops, ModItems.can_smart, Items.bowl }); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.coffee), new Object[] { "dustCoal", Items.milk_bucket, Items.potionitem, Items.sugar })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.coffee_radium), new Object[] { ModItems.coffee, ModItems.nugget_ra226 }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_smore), new Object[] { Items.wheat, new ItemStack(ModItems.marshmallow, 1, 1), new ItemStack(Items.dye, 1, 3) }); //Peas GameRegistry.addRecipe(new ItemStack(ModItems.peas), new Object[] { " S ", "SNS", " S ", 'S', Items.wheat_seeds, 'N', Items.gold_nugget }); diff --git a/src/main/java/com/hbm/inventory/AnvilSmithingHotRecipe.java b/src/main/java/com/hbm/inventory/AnvilSmithingHotRecipe.java index 2984ac3d3..48ee0ed73 100644 --- a/src/main/java/com/hbm/inventory/AnvilSmithingHotRecipe.java +++ b/src/main/java/com/hbm/inventory/AnvilSmithingHotRecipe.java @@ -1,12 +1,12 @@ package com.hbm.inventory; +import java.util.Arrays; import java.util.List; import com.hbm.inventory.RecipesCommon.AStack; import com.hbm.items.special.ItemHot; import net.minecraft.item.ItemStack; -import scala.actors.threadpool.Arrays; public class AnvilSmithingHotRecipe extends AnvilSmithingRecipe { diff --git a/src/main/java/com/hbm/inventory/RecipesCommon.java b/src/main/java/com/hbm/inventory/RecipesCommon.java index f7717faa2..6bfa5c395 100644 --- a/src/main/java/com/hbm/inventory/RecipesCommon.java +++ b/src/main/java/com/hbm/inventory/RecipesCommon.java @@ -1,5 +1,6 @@ package com.hbm.inventory; +import java.util.Arrays; import java.util.List; import net.minecraft.block.Block; @@ -7,7 +8,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; -import scala.actors.threadpool.Arrays; public class RecipesCommon { diff --git a/src/main/java/com/hbm/inventory/ShredderRecipes.java b/src/main/java/com/hbm/inventory/ShredderRecipes.java index 0dddd1341..4d6d10a98 100644 --- a/src/main/java/com/hbm/inventory/ShredderRecipes.java +++ b/src/main/java/com/hbm/inventory/ShredderRecipes.java @@ -7,6 +7,7 @@ import java.util.Map; import com.hbm.blocks.ModBlocks; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; +import com.hbm.main.MainRegistry; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -44,7 +45,10 @@ public class ShredderRecipes { if(dust != null && dust.getItem() != ModItems.scrap) { for(ItemStack stack : matches) { - shredderRecipes.put(new ComparableStack(stack), dust); + if(stack != null) + shredderRecipes.put(new ComparableStack(stack), dust); + else + MainRegistry.logger.error("Ore dict entry '" + name + "' has a null stack!"); } } } else if(name.length() > 3 && name.substring(0, 3).equals("ore")) { @@ -55,7 +59,10 @@ public class ShredderRecipes { dust.stackSize = 2; for(ItemStack stack : matches) { - shredderRecipes.put(new ComparableStack(stack), dust); + if(stack != null) + shredderRecipes.put(new ComparableStack(stack), dust); + else + MainRegistry.logger.error("Ore dict entry '" + name + "' has a null stack!"); } } } else if(name.length() > 5 && name.substring(0, 5).equals("block")) { @@ -66,7 +73,10 @@ public class ShredderRecipes { dust.stackSize = 9; for(ItemStack stack : matches) { - shredderRecipes.put(new ComparableStack(stack), dust); + if(stack != null) + shredderRecipes.put(new ComparableStack(stack), dust); + else + MainRegistry.logger.error("Ore dict entry '" + name + "' has a null stack!"); } } } else if(name.length() > 3 && name.substring(0, 3).equals("gem")) { @@ -75,7 +85,10 @@ public class ShredderRecipes { if(dust != null && dust.getItem() != ModItems.scrap) { for(ItemStack stack : matches) { - shredderRecipes.put(new ComparableStack(stack), dust); + if(stack != null) + shredderRecipes.put(new ComparableStack(stack), dust); + else + MainRegistry.logger.error("Ore dict entry '" + name + "' has a null stack!"); } } } else if(name.length() > 7 && name.substring(0, 7).equals("crystal")) { @@ -84,13 +97,19 @@ public class ShredderRecipes { if(dust != null && dust.getItem() != ModItems.scrap) { for(ItemStack stack : matches) { - shredderRecipes.put(new ComparableStack(stack), dust); + if(stack != null) + shredderRecipes.put(new ComparableStack(stack), dust); + else + MainRegistry.logger.error("Ore dict entry '" + name + "' has a null stack!"); } } } else if(name.length() > 3 && name.substring(0, 4).equals("dust")) { for(ItemStack stack : matches) { - shredderRecipes.put(new ComparableStack(stack), new ItemStack(ModItems.dust)); + if(stack != null) + shredderRecipes.put(new ComparableStack(stack), new ItemStack(ModItems.dust)); + else + MainRegistry.logger.error("Ore dict entry '" + name + "' has a null stack!"); } } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIRBMKConsole.java b/src/main/java/com/hbm/inventory/gui/GUIRBMKConsole.java index ed6a5ff8e..352d32f5b 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIRBMKConsole.java +++ b/src/main/java/com/hbm/inventory/gui/GUIRBMKConsole.java @@ -50,18 +50,17 @@ public class GUIRBMKConsole extends GuiScreen { public void initGui() { super.initGui(); - Keyboard.enableRepeatEvents(true); - - for(int i = 0; i < 4; i++) { - this.field = new GuiTextField(this.fontRendererObj, guiLeft + 9, guiTop + 84, 35, 9); - this.field.setTextColor(0x00ff00); - this.field.setDisabledTextColour(0x008000); - this.field.setEnableBackgroundDrawing(false); - this.field.setMaxStringLength(3); - } this.guiLeft = (this.width - this.xSize) / 2; this.guiTop = (this.height - this.ySize) / 2; + + Keyboard.enableRepeatEvents(true); + + this.field = new GuiTextField(this.fontRendererObj, guiLeft + 9, guiTop + 84, 35, 9); + this.field.setTextColor(0x00ff00); + this.field.setDisabledTextColour(0x008000); + this.field.setEnableBackgroundDrawing(false); + this.field.setMaxStringLength(3); } @Override @@ -310,4 +309,9 @@ public class GUIRBMKConsole extends GuiScreen { super.keyTyped(c, i); } + + @Override + public boolean doesGuiPauseGame() { + return false; + } } diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 49b4e2c27..ab55ee161 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -29,6 +29,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; +import net.minecraft.item.ItemFood; import net.minecraft.item.ItemSoup; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -126,6 +127,7 @@ public class ModItems { public static Item ingot_semtex; public static Item ingot_boron; public static Item ingot_graphite; + public static Item ingot_smore; public static Item ingot_australium; public static Item ingot_weidanium; @@ -1981,6 +1983,7 @@ public class ModItems { public static Item drax; public static Item drax_mk2; public static Item drax_mk3; + public static Item bismuth_pickaxe; public static Item chlorophyte_pickaxe; public static Item mese_pickaxe; @@ -2427,6 +2430,7 @@ public class ModItems { ingot_cobalt = new Item().setUnlocalizedName("ingot_cobalt").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_cobalt"); ingot_boron = new Item().setUnlocalizedName("ingot_boron").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_boron"); ingot_graphite = new Item().setUnlocalizedName("ingot_graphite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_graphite"); + ingot_smore = new ItemFood(10, 20F, false).setUnlocalizedName("ingot_smore").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_smore"); sulfur = new Item().setUnlocalizedName("sulfur").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":sulfur"); ingot_uranium_fuel = new ItemHazard(ItemHazard.uf * ItemHazard.ingot).setUnlocalizedName("ingot_uranium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_uranium_fuel"); @@ -4155,7 +4159,7 @@ public class ModItems { pancake = new ItemPancake(20, 20, false).setUnlocalizedName("pancake").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pancake"); nugget = new ItemLemon(200, 200, false).setUnlocalizedName("nugget").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":nugget"); peas = new ItemPeas().setUnlocalizedName("peas").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":peas"); - marshmallow = new Item().setUnlocalizedName("marshmallow").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":marshmallow"); + marshmallow = new ItemMarshmallow().setUnlocalizedName("marshmallow").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":marshmallow"); cheese = new ItemLemon(5, 10, false).setUnlocalizedName("cheese").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cheese"); defuser = new Item().setUnlocalizedName("defuser").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":defuser"); @@ -4915,6 +4919,17 @@ public class ModItems { .addBreakAbility(new ToolAbility.HammerAbility(4)) .addBreakAbility(new ToolAbility.RecursionAbility(9)).setUnlocalizedName("drax_mk3").setTextureName(RefStrings.MODID + ":drax_mk3"); + ToolMaterial matBismuth = EnumHelper.addToolMaterial("HBM_BISMUTH", 4, 0, 50F, 0.0F, 200).setRepairItem(new ItemStack(ModItems.ingot_bismuth)); + bismuth_pickaxe = new ItemToolAbility(15F, 0, matBismuth, EnumToolType.MINER) + .addBreakAbility(new ToolAbility.HammerAbility(2)) + .addBreakAbility(new ToolAbility.ShredderAbility()) + .addBreakAbility(new ToolAbility.LuckAbility(2)) + .addBreakAbility(new ToolAbility.SilkAbility()) + .addHitAbility(new WeaponAbility.StunAbility(5)) + .addHitAbility(new WeaponAbility.VampireAbility(2F)) + .addHitAbility(new WeaponAbility.BeheaderAbility()) + .setDepthRockBreaker().setUnlocalizedName("bismuth_pickaxe").setTextureName(RefStrings.MODID + ":bismuth_pickaxe"); + ToolMaterial matChlorophyte = EnumHelper.addToolMaterial("HBM_CHLOROPHYTE", 4, 0, 50F, 0.0F, 200).setRepairItem(new ItemStack(ModItems.powder_chlorophyte)); chlorophyte_pickaxe = new ItemToolAbility(20F, 0, matChlorophyte, EnumToolType.MINER) .addBreakAbility(new ToolAbility.HammerAbility(2)) @@ -4923,7 +4938,8 @@ public class ModItems { .addBreakAbility(new ToolAbility.MercuryAbility()) .addHitAbility(new WeaponAbility.StunAbility(10)) .addHitAbility(new WeaponAbility.VampireAbility(5F)) - .addHitAbility(new WeaponAbility.BeheaderAbility()).setUnlocalizedName("chlorophyte_pickaxe").setTextureName(RefStrings.MODID + ":chlorophyte_pickaxe"); + .addHitAbility(new WeaponAbility.BeheaderAbility()) + .setDepthRockBreaker().setUnlocalizedName("chlorophyte_pickaxe").setTextureName(RefStrings.MODID + ":chlorophyte_pickaxe"); ToolMaterial matMese = EnumHelper.addToolMaterial("HBM_MESE", 4, 0, 50F, 0.0F, 200).setRepairItem(new ItemStack(ModItems.plate_paa)); mese_pickaxe = new ItemToolAbility(35F, 0, matMese, EnumToolType.MINER) @@ -4938,7 +4954,8 @@ public class ModItems { .addBreakAbility(new ToolAbility.ExplosionAbility(15F)) .addHitAbility(new WeaponAbility.StunAbility(10)) .addHitAbility(new WeaponAbility.PhosphorusAbility(60)) - .addHitAbility(new WeaponAbility.BeheaderAbility()).setUnlocalizedName("mese_pickaxe").setTextureName(RefStrings.MODID + ":mese_pickaxe"); + .addHitAbility(new WeaponAbility.BeheaderAbility()) + .setDepthRockBreaker().setUnlocalizedName("mese_pickaxe").setTextureName(RefStrings.MODID + ":mese_pickaxe"); ToolMaterial matMeteorite = EnumHelper.addToolMaterial("HBM_METEORITE", 4, 0, 50F, 0.0F, 200).setRepairItem(new ItemStack(ModItems.plate_paa)); meteorite_sword = new ItemSwordMeteorite(10F, 0, matMeteorite).setUnlocalizedName("meteorite_sword").setTextureName(RefStrings.MODID + ":meteorite_sword"); @@ -5290,6 +5307,7 @@ public class ModItems { GameRegistry.registerItem(ingot_euphemium, ingot_euphemium.getUnlocalizedName()); GameRegistry.registerItem(ingot_dineutronium, ingot_dineutronium.getUnlocalizedName()); GameRegistry.registerItem(ingot_electronium, ingot_electronium.getUnlocalizedName()); + GameRegistry.registerItem(ingot_smore, ingot_smore.getUnlocalizedName()); //Meteorite Ingots GameRegistry.registerItem(ingot_steel_dusted, ingot_steel_dusted.getUnlocalizedName()); @@ -6991,6 +7009,7 @@ public class ModItems { GameRegistry.registerItem(drax, drax.getUnlocalizedName()); GameRegistry.registerItem(drax_mk2, drax_mk2.getUnlocalizedName()); GameRegistry.registerItem(drax_mk3, drax_mk3.getUnlocalizedName()); + GameRegistry.registerItem(bismuth_pickaxe, bismuth_pickaxe.getUnlocalizedName()); GameRegistry.registerItem(chlorophyte_pickaxe, chlorophyte_pickaxe.getUnlocalizedName()); GameRegistry.registerItem(mese_pickaxe, mese_pickaxe.getUnlocalizedName()); GameRegistry.registerItem(matchstick, matchstick.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/food/ItemMarshmallow.java b/src/main/java/com/hbm/items/food/ItemMarshmallow.java new file mode 100644 index 000000000..7cd9a74f6 --- /dev/null +++ b/src/main/java/com/hbm/items/food/ItemMarshmallow.java @@ -0,0 +1,44 @@ +package com.hbm.items.food; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +public class ItemMarshmallow extends Item { + + @SideOnly(Side.CLIENT) + private IIcon iconRoasted; + + public ItemMarshmallow() { + this.setHasSubtypes(true); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs tab, List list) { + list.add(new ItemStack(item, 1, 0)); + list.add(new ItemStack(item, 1, 1)); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister p_94581_1_) { + super.registerIcons(p_94581_1_); + this.iconRoasted = p_94581_1_.registerIcon(this.getIconString() + "_roasted"); + } + + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + + if(damage == 1) + return this.iconRoasted; + + return super.getIconFromDamage(damage); + } +} diff --git a/src/main/java/com/hbm/items/tool/ItemToolAbility.java b/src/main/java/com/hbm/items/tool/ItemToolAbility.java index 8833f682f..48b10527d 100644 --- a/src/main/java/com/hbm/items/tool/ItemToolAbility.java +++ b/src/main/java/com/hbm/items/tool/ItemToolAbility.java @@ -12,6 +12,7 @@ import com.hbm.handler.ToolAbility; import com.hbm.handler.ToolAbility.*; import com.hbm.handler.WeaponAbility; +import api.hbm.item.IDepthRockTool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; @@ -37,7 +38,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.event.world.BlockEvent; -public class ItemToolAbility extends ItemTool implements IItemAbility { +public class ItemToolAbility extends ItemTool implements IItemAbility, IDepthRockTool { private EnumToolType toolType; private EnumRarity rarity = EnumRarity.common; @@ -243,42 +244,47 @@ public class ItemToolAbility extends ItemTool implements IItemAbility { } } - @SideOnly(Side.CLIENT) - public boolean hasEffect(ItemStack stack) { - - return getCurrentAbility(stack) != null ? true : super.hasEffect(stack); - } - - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { - - if(this.breakAbility.size() > 1) { - list.add("Abilities: "); - - for(ToolAbility ability : this.breakAbility) { - - if(ability != null) { - - if(getCurrentAbility(stack) == ability) - list.add(" >" + EnumChatFormatting.GOLD + ability.getFullName()); - else - list.add(" " + EnumChatFormatting.GOLD + ability.getFullName()); - } - } + @SideOnly(Side.CLIENT) + public boolean hasEffect(ItemStack stack) { - list.add("Right click to cycle through abilities!"); - list.add("Sneak-click to turn abilitty off!"); - } - - if(!this.hitAbility.isEmpty()) { - - list.add("Weapon modifiers: "); - - for(WeaponAbility ability : this.hitAbility) { + return getCurrentAbility(stack) != null ? true : super.hasEffect(stack); + } + + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { + + if(this.breakAbility.size() > 1) { + list.add("Abilities: "); + + for(ToolAbility ability : this.breakAbility) { + + if(ability != null) { + + if(getCurrentAbility(stack) == ability) + list.add(" >" + EnumChatFormatting.GOLD + ability.getFullName()); + else + list.add(" " + EnumChatFormatting.GOLD + ability.getFullName()); + } + } + + list.add("Right click to cycle through abilities!"); + list.add("Sneak-click to turn abilitty off!"); + } + + if(!this.hitAbility.isEmpty()) { + + list.add("Weapon modifiers: "); + + for(WeaponAbility ability : this.hitAbility) { list.add(" " + EnumChatFormatting.RED + ability.getFullName()); - } - } - } + } + } + + if(this.rockBreaker) { + list.add(""); + list.add(EnumChatFormatting.RED + "Can break depth rock!"); + } + } public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { @@ -335,15 +341,27 @@ public class ItemToolAbility extends ItemTool implements IItemAbility { return 0; } - private void setAbility(ItemStack stack, int ability) { + private void setAbility(ItemStack stack, int ability) { - if(!stack.hasTagCompound()) - stack.stackTagCompound = new NBTTagCompound(); - - stack.stackTagCompound.setInteger("ability", ability); - } - - protected boolean canOperate(ItemStack stack) { - return true; - } + if(!stack.hasTagCompound()) + stack.stackTagCompound = new NBTTagCompound(); + + stack.stackTagCompound.setInteger("ability", ability); + } + + protected boolean canOperate(ItemStack stack) { + return true; + } + + public ItemToolAbility setDepthRockBreaker() { + this.rockBreaker = true; + return this; + } + + private boolean rockBreaker = false; + + @Override + public boolean canBreakRock(World world, EntityPlayer player, ItemStack tool, Block block, int x, int y, int z) { + return canOperate(tool) && this.rockBreaker; + } } diff --git a/src/main/java/com/hbm/lib/HbmWorldGen.java b/src/main/java/com/hbm/lib/HbmWorldGen.java index e9303f889..06079c5a6 100644 --- a/src/main/java/com/hbm/lib/HbmWorldGen.java +++ b/src/main/java/com/hbm/lib/HbmWorldGen.java @@ -103,11 +103,11 @@ public class HbmWorldGen implements IWorldGenerator { if(WorldConfig.gasbubbleSpawn > 0 && rand.nextInt(WorldConfig.gasbubbleSpawn) == 0) DungeonToolbox.generateOre(world, rand, i, j, 1, 32, 30, 10, ModBlocks.gas_flammable); - DepthDeposit.generateCondition(world, i, 0, 3, j, 5, 0.6D, ModBlocks.cluster_depth_iron, rand, 24); - DepthDeposit.generateCondition(world, i, 0, 3, j, 5, 0.6D, ModBlocks.cluster_depth_titanium, rand, 32); - DepthDeposit.generateCondition(world, i, 0, 3, j, 5, 0.6D, ModBlocks.cluster_depth_tungsten, rand, 32); - DepthDeposit.generateCondition(world, i, 0, 3, j, 5, 0.8D, ModBlocks.ore_depth_cinnebar, rand, 16); - DepthDeposit.generateCondition(world, i, 0, 3, j, 5, 0.8D, ModBlocks.ore_depth_zirconium, rand, 16); + DepthDeposit.generateConditionOverworld(world, i, 0, 3, j, 5, 0.6D, ModBlocks.cluster_depth_iron, rand, 24); + DepthDeposit.generateConditionOverworld(world, i, 0, 3, j, 5, 0.6D, ModBlocks.cluster_depth_titanium, rand, 32); + DepthDeposit.generateConditionOverworld(world, i, 0, 3, j, 5, 0.6D, ModBlocks.cluster_depth_tungsten, rand, 32); + DepthDeposit.generateConditionOverworld(world, i, 0, 3, j, 5, 0.8D, ModBlocks.ore_depth_cinnebar, rand, 16); + DepthDeposit.generateConditionOverworld(world, i, 0, 3, j, 5, 0.8D, ModBlocks.ore_depth_zirconium, rand, 16); Random colRand = new Random(world.getSeed() + 5); int colX = (int) (colRand.nextGaussian() * 1500); @@ -606,6 +606,9 @@ public class HbmWorldGen implements IWorldGenerator { if(GeneralConfig.enablePlutoniumOre) DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.netherPlutoniumSpawn, 4, 0, 127, ModBlocks.ore_nether_plutonium, Blocks.netherrack); + DepthDeposit.generateConditionNether(world, i, 0, 3, j, 7, 0.6D, ModBlocks.ore_depth_nether_neodymium, rand, 16); + DepthDeposit.generateConditionNether(world, i, 125, 3, j, 7, 0.6D, ModBlocks.ore_depth_nether_neodymium, rand, 16); + for(int k = 0; k < 30; k++){ int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 66f62fd9a..f8b31f1b6 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -918,6 +918,15 @@ public class ClientProxy extends ServerProxy { if("cloud".equals(data.getString("mode"))) { fx = new net.minecraft.client.particle.EntityCloudFX(world, x, y, z, mX, mY, mZ); + + if(data.hasKey("r")) { + float rng = rand.nextFloat() * 0.1F; + fx.setRBGColorF(data.getFloat("r") + rng, data.getFloat("g") + rng, data.getFloat("b") + rng); + ReflectionHelper.setPrivateValue(net.minecraft.client.particle.EntityCloudFX.class, (EntityCloudFX)fx, 7.5F, "field_70569_a"); + fx.motionX = 0; + fx.motionY = 0; + fx.motionZ = 0; + } } if("reddust".equals(data.getString("mode"))) { diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index f8b3c9b08..55610a57f 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -491,6 +491,8 @@ public class MainRegistry { GameRegistry.registerTileEntity(TileEntityRBMKModerator.class, "tileentity_rbmk_moderator"); GameRegistry.registerTileEntity(TileEntityRBMKOutgasser.class, "tileentity_rbmk_outgasser"); GameRegistry.registerTileEntity(TileEntityRBMKConsole.class, "tileentity_rbmk_console"); + GameRegistry.registerTileEntity(TileEntityRBMKInlet.class, "tileentity_rbmk_inlet"); + GameRegistry.registerTileEntity(TileEntityRBMKOutlet.class, "tileentity_rbmk_outlet"); EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true); EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true); diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index 16b2dd5bf..9dcfbc13c 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java @@ -318,7 +318,7 @@ public class ModEventHandlerClient { } } - if(player.getCurrentArmor(2) == null && (player.getUniqueID().toString().equals(Library.SolsticeUnlimitd) || player.getDisplayName().equals("SolsticeUnlimitd"))) + if(player.getCurrentArmor(2) == null && !player.isPotionActive(Potion.invisibility) && (player.getUniqueID().toString().equals(Library.SolsticeUnlimitd) || player.getDisplayName().equals("SolsticeUnlimitd"))) RenderAccessoryUtility.renderSol(event); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSBase.java b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSBase.java index 5b25f413f..2b0cab69d 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSBase.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSBase.java @@ -2,6 +2,7 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; +import java.util.Random; import com.hbm.entity.effect.EntityCloudFleijaRainbow; import com.hbm.entity.logic.EntityNukeExplosionMK4; @@ -35,7 +36,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import scala.util.Random; public class TileEntityAMSBase extends TileEntity implements ISidedInventory, ISource, IFluidContainer, IFluidAcceptor { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSEmitter.java b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSEmitter.java index b182a92b8..7f6d42dcc 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSEmitter.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSEmitter.java @@ -2,6 +2,7 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; +import java.util.Random; import com.hbm.explosion.ExplosionLarge; import com.hbm.handler.FluidTypeHandler.FluidType; @@ -25,7 +26,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import scala.util.Random; public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, IConsumer, IFluidContainer, IFluidAcceptor { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSLimiter.java b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSLimiter.java index 6f60c88fe..c330229ac 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSLimiter.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSLimiter.java @@ -2,6 +2,7 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; +import java.util.Random; import com.hbm.entity.particle.EntityGasFlameFX; import com.hbm.explosion.ExplosionLarge; @@ -26,7 +27,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import scala.util.Random; public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, IConsumer, IFluidContainer, IFluidAcceptor { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java index 088890692..12f6f354f 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java @@ -1,6 +1,7 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import com.google.common.collect.HashBiMap; @@ -24,7 +25,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; -import scala.actors.threadpool.Arrays; public class TileEntityMachineIGenerator extends TileEntityMachineBase implements ISource, IFluidAcceptor { diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java b/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java index d0f9fc9b7..ba2df79c9 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java @@ -22,6 +22,7 @@ public class RBMKDials { public static final String KEY_REASIM_RANGE = "dialReasimRange"; public static final String KEY_REASIM_COUNT = "dialReasimCount"; public static final String KEY_REASIM_MOD = "dialReasimOutputMod"; + public static final String KEY_REASIM_BOILERS = "dialReasimBoilers"; public static void createDials(World world) { GameRules rules = world.getGameRules(); @@ -43,6 +44,7 @@ public class RBMKDials { rules.setOrCreateGameRule(KEY_REASIM_RANGE, "10"); rules.setOrCreateGameRule(KEY_REASIM_COUNT, "6"); rules.setOrCreateGameRule(KEY_REASIM_MOD, "1.0"); + rules.setOrCreateGameRule(KEY_REASIM_BOILERS, "false"); } } @@ -181,6 +183,15 @@ public class RBMKDials { return Math.max(shittyWorkaroundParseDouble(world.getGameRules().getGameRuleStringValue(KEY_REASIM_MOD), 1.0D), 0.0D); } + /** + * Whether or not all components should act like boilers with dedicated in/outlet blocks + * @param world + * @return + */ + public static boolean getReasimBoilers(World world) { + return world.getGameRules().getGameRuleBooleanValue(KEY_REASIM_BOILERS); + } + //why make the double representation accessible in a game rule when you can just force me to add a second pointless parsing operation? public static double shittyWorkaroundParseDouble(String s, double def) { diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKInlet.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKInlet.java new file mode 100644 index 000000000..0b4739e0f --- /dev/null +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKInlet.java @@ -0,0 +1,49 @@ +package com.hbm.tileentity.machine.rbmk; + +import java.util.List; + +import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.interfaces.IFluidAcceptor; +import com.hbm.inventory.FluidTank; + +import net.minecraft.tileentity.TileEntity; + +public class TileEntityRBMKInlet extends TileEntity implements IFluidAcceptor { + + @Override + public void setFillstate(int fill, int index) { + // TODO Auto-generated method stub + + } + + @Override + public void setFluidFill(int fill, FluidType type) { + // TODO Auto-generated method stub + + } + + @Override + public void setType(FluidType type, int index) { + // TODO Auto-generated method stub + + } + + @Override + public List getTanks() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getFluidFill(FluidType type) { + // TODO Auto-generated method stub + return 0; + } + + @Override + public int getMaxFluidFill(FluidType type) { + // TODO Auto-generated method stub + return 0; + } + +} diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutlet.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutlet.java new file mode 100644 index 000000000..b8cb680e2 --- /dev/null +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutlet.java @@ -0,0 +1,74 @@ +package com.hbm.tileentity.machine.rbmk; + +import java.util.List; + +import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.interfaces.IFluidAcceptor; +import com.hbm.interfaces.IFluidSource; +import com.hbm.inventory.FluidTank; + +import net.minecraft.tileentity.TileEntity; + +public class TileEntityRBMKOutlet extends TileEntity implements IFluidSource { + + @Override + public void setFillstate(int fill, int index) { + // TODO Auto-generated method stub + + } + + @Override + public void setFluidFill(int fill, FluidType type) { + // TODO Auto-generated method stub + + } + + @Override + public void setType(FluidType type, int index) { + // TODO Auto-generated method stub + + } + + @Override + public List getTanks() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getFluidFill(FluidType type) { + // TODO Auto-generated method stub + return 0; + } + + @Override + public void fillFluidInit(FluidType type) { + // TODO Auto-generated method stub + + } + + @Override + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { + // TODO Auto-generated method stub + + } + + @Override + public boolean getTact() { + // TODO Auto-generated method stub + return false; + } + + @Override + public List getFluidList(FluidType type) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void clearFluidList(FluidType type) { + // TODO Auto-generated method stub + + } + +} diff --git a/src/main/java/com/hbm/world/feature/DepthDeposit.java b/src/main/java/com/hbm/world/feature/DepthDeposit.java index ede86de3b..f3ac76f35 100644 --- a/src/main/java/com/hbm/world/feature/DepthDeposit.java +++ b/src/main/java/com/hbm/world/feature/DepthDeposit.java @@ -11,31 +11,43 @@ import net.minecraft.world.World; public class DepthDeposit { - public static void generateCondition(World world, int x, int yMin, int yDev, int z, int size, double fill, Block block, Random rand, int chance) { + public static void generateConditionOverworld(World world, int x, int yMin, int yDev, int z, int size, double fill, Block block, Random rand, int chance) { if(rand.nextInt(chance) == 0) - generate(world, x + rand.nextInt(16), yMin + rand.nextInt(yDev), z + rand.nextInt(16), size, fill, block, rand); + generate(world, x + rand.nextInt(16), yMin + rand.nextInt(yDev), z + rand.nextInt(16), size, fill, block, rand, Blocks.stone, ModBlocks.stone_depth); } - public static void generate(World world, int x, int y, int z, int size, double fill, Block block, Random rand) { + public static void generateConditionNether(World world, int x, int yMin, int yDev, int z, int size, double fill, Block block, Random rand, int chance) { + + if(rand.nextInt(chance) == 0) + generate(world, x + rand.nextInt(16), yMin + rand.nextInt(yDev), z + rand.nextInt(16), size, fill, block, rand, Blocks.netherrack, ModBlocks.stone_depth_nether); + } + + public static void generateCondition(World world, int x, int yMin, int yDev, int z, int size, double fill, Block block, Random rand, int chance, Block genTarget, Block filler) { + + if(rand.nextInt(chance) == 0) + generate(world, x + rand.nextInt(16), yMin + rand.nextInt(yDev), z + rand.nextInt(16), size, fill, block, rand, genTarget, filler); + } + + public static void generate(World world, int x, int y, int z, int size, double fill, Block block, Random rand, Block genTarget, Block filler) { for(int i = x - size; i <= x + size; i++) { for(int j = y - size; j <= y + size; j++) { for(int k = z - size; k <= z + size; k++) { - if(j < 1) + if(j < 1 || j > 126) continue; double len = Vec3.createVectorHelper(x - i, y - j, z - k).lengthVector(); Block target = world.getBlock(i, j, k); - if(target.isReplaceableOreGen(world, i, j, k, Blocks.stone) || target.isReplaceableOreGen(world, i, j, k, Blocks.bedrock)) { //yes you've heard right, bedrock + if(target.isReplaceableOreGen(world, i, j, k, genTarget) || target.isReplaceableOreGen(world, i, j, k, Blocks.bedrock)) { //yes you've heard right, bedrock if(len + rand.nextInt(2) < size * fill) { world.setBlock(i, j, k, block); } else if(len + rand.nextInt(2) <= size) { - world.setBlock(i, j, k, ModBlocks.stone_depth); + world.setBlock(i, j, k, filler); } } } diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index a1148f884..fff66451d 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -748,6 +748,7 @@ item.billet_uranium_fuel.name=Urankernbrennstoffbillet item.billet_yharonite.name=Yharonitbillet item.biomass.name=Biomasse item.biomass_compressed.name=Verdichtete Biomasse +item.bismuth_pickaxe.name=Bismutspitzhacke item.bismuth_tool.name=Magnetischer Extraktor item.bj_boots.name=Lunare Beschlagene Stiefel item.bj_helmet.name=Augenklappe mit Infrarot-Sensor @@ -1455,6 +1456,7 @@ item.ingot_schrabidium.name=Schrabidiumbarren item.ingot_schrabidium_fuel.name=Schrabidiumkernbrennstoffbarren item.ingot_schraranium.name=Schraraniumbarren item.ingot_semtex.name=Semtextafel +item.ingot_smore.name=S'morebarren item.ingot_solinium.name=Soliniumbarren item.ingot_starmetal.name=§9Sternenmetallbarren§r item.ingot_steel.name=Stahlbarren @@ -2626,6 +2628,7 @@ tile.block_schrabidium_fuel.name=Schrabidiumkernbrennstoffblock tile.block_schraranium.name=Schraraniumblock tile.block_scrap.name=Schrottblock tile.block_semtex.name=Semtexblock +tile.block_smore.name=S'moreblock tile.block_solinium.name=Soliniumblock tile.block_starmetal.name=§9Sternenmetallblock§r tile.block_steel.name=Stahlblock @@ -2743,6 +2746,8 @@ tile.deco_steel.name=Stahl-Dekoblock tile.deco_titanium.name=Titan-Dekoblock tile.deco_tungsten.name=Wolfram-Dekoblock tile.decon.name=Spieler-Dekontaminierer +tile.depth_brick.name=Tiefenziegel +tile.depth_tiles.name=Tiefenfliesen tile.det_charge.name=Sprengladung tile.det_cord.name=Det Cord tile.det_miner.name=Bergbau-Sprengladung @@ -2809,6 +2814,9 @@ tile.glass_lead.name=Bleiglas tile.glass_polonium.name=Poloniumglas tile.glass_trinitite.name=Trinity-Glas tile.glass_uranium.name=Uranglas +tile.gneiss_brick.name=Schieferziegel +tile.gneiss_chiseled.name=Gemeißelter Schiefer +tile.gneiss_tile.name=Schieferfliese tile.gravel_diamond.name=Diamantkies tile.gravel_obsidian.name=Gebrochener Obsidian tile.hadron_access.name=Teilchenbeschleuniger-Zugriffskonsole @@ -2994,6 +3002,7 @@ tile.ore_coltan.name=Coltanerz tile.ore_copper.name=Kupfererz tile.ore_daffergon.name=Dellit tile.ore_depth_cinnebar.name=Tiefen-Zinnobererz +tile.ore_depth_nether_neodymium.name=Nether-Tiefen-Neodymerz tile.ore_depth_zirconium.name=Tiefen-Zirkonerz tile.ore_fluorite.name=Fluoriterz tile.ore_gneiss_asbestos.name=Schiefer-Asbesterz @@ -3132,6 +3141,7 @@ tile.steel_roof.name=Flaches Stachldach tile.steel_scaffold.name=Stahlgerüst tile.steel_wall.name=Stahlwand tile.stone_depth.name=Tiefenfels +tile.stone_depth_nether.name=Nether-Tiefenfels tile.stone_gneiss.name=Graphitschiefer tile.struct_iter_core.name=Fusionsreaktor-Kernkomponente tile.struct_launcher.name=Startrampe-Komponentenblock diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 7ce2f918d..cf79f9cf6 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -816,6 +816,7 @@ item.billet_uranium_fuel.name=Uranium Fuel Billet item.billet_yharonite.name=Yharonite Billet item.biomass.name=Biomass item.biomass_compressed.name=Compressed Biomass +item.bismuth_pickaxe.name=Bismuth Pickaxe item.bismuth_tool.name=Magnetic Extractor item.bj_boots.name=Lunar Studded Boots item.bj_helmet.name=Eyepatch with Thermal Sensor @@ -1523,6 +1524,7 @@ item.ingot_schrabidium.name=Schrabidium Ingot item.ingot_schrabidium_fuel.name=Ingot of Schrabidium Fuel item.ingot_schraranium.name=Schraranium Ingot item.ingot_semtex.name=Bar of Semtex +item.ingot_smore.name=S'more Ingot item.ingot_solinium.name=Solinium Ingot item.ingot_starmetal.name=§9Starmetal Ingot§r item.ingot_steel.name=Steel Ingot @@ -2694,6 +2696,7 @@ tile.block_schrabidium_fuel.name=Block of Schrabidium Fuel tile.block_schraranium.name=Block of Schraranium tile.block_scrap.name=Block of Scrap tile.block_semtex.name=Block of Semtex +tile.block_smore.name=Block of S'more tile.block_solinium.name=Block of Solinium tile.block_starmetal.name=§9Block of Starmetal§r tile.block_steel.name=Block of Steel @@ -2827,6 +2830,8 @@ tile.deco_steel.name=Steel Deco Block tile.deco_titanium.name=Titanium Deco Block tile.deco_tungsten.name=Tungsten Deco Block tile.decon.name=Player Decontaminator +tile.depth_brick.name=Depth Brick +tile.depth_tiles.name=Depth Tiles tile.det_charge.name=Explosive Charge tile.det_cord.name=Det Cord tile.det_miner.name=Mining Charge @@ -2893,6 +2898,9 @@ tile.glass_lead.name=Lead Glass tile.glass_polonium.name=Polonium Glass tile.glass_trinitite.name=Trinity Glass tile.glass_uranium.name=Uranium Glass +tile.gneiss_brick.name=Schist Brick +tile.gneiss_chiseled.name=Chiseled Schist +tile.gneiss_tile.name=Schist Tile tile.gravel_diamond.name=Diamond Gravel tile.gravel_obsidian.name=Crushed Obsidian tile.hadron_access.name=Particle Accelerator Access Terminal @@ -3078,6 +3086,7 @@ tile.ore_coltan.name=Coltan Ore tile.ore_copper.name=Copper Ore tile.ore_daffergon.name=Dellite tile.ore_depth_cinnebar.name=Depth Cinnabar Ore +tile.ore_depth_nether_neodymium.name=Nether Depth Neodymium Ore tile.ore_depth_zirconium.name=Depth Zirconium Ore tile.ore_fluorite.name=Fluorite Ore tile.ore_gneiss_asbestos.name=Schist Asbestos Ore @@ -3216,6 +3225,7 @@ tile.steel_roof.name=Flat Steel Roof tile.steel_scaffold.name=Steel Scaffold tile.steel_wall.name=Steel Wall tile.stone_depth.name=Depth Rock +tile.stone_depth_nether.name=Nether Depth Rock tile.stone_gneiss.name=Graphitic Schist tile.struct_iter_core.name=Fusion Reactor Core Component tile.struct_launcher.name=Launch Pad Component Block diff --git a/src/main/resources/assets/hbm/lang/zh_CN.lang b/src/main/resources/assets/hbm/lang/zh_CN.lang index 73c211edf..7121e8e3e 100644 --- a/src/main/resources/assets/hbm/lang/zh_CN.lang +++ b/src/main/resources/assets/hbm/lang/zh_CN.lang @@ -1,15 +1,4 @@ -itemGroup.tabTest=HBM的核科技mod测试项[S166、Bismarck、nukesteve联合汉化] -itemGroup.tabParts=NTM 资源和零件 -itemGroup.tabControl=NTM 机器项目和燃料 -itemGroup.tabTemplate=NTM 模板 -itemGroup.tabBlocks=NTM 矿石和方块 -itemGroup.tabMachine=NTM 机器 -itemGroup.tabNuke=NTM 炸弹 -itemGroup.tabMissile=NTM 导弹和卫星 -itemGroup.tabWeapon=NTM 武器和炮塔 -itemGroup.tabConsumable=NTM 食物和装备 - -achievement.FOEQ.desc=向火星传送信号...其实我是说Duna +achievement.FOEQ.desc=向火星传送信号...其实我是说Duna achievement.FOEQ=飞马座运载火箭和发射架 achievement.assembly.desc=Bobmazon 2级 (装配机) achievement.assembly=制作 @@ -21,19 +10,31 @@ achievement.bossMeltdown.desc=比伟大更可怕,但我会竭尽所能 achievement.bossMeltdown=3.6伦琴 achievement.bossWorm.desc=法布斯塔夫。我的屁股。你算算吧。 achievement.bossWorm=拆掉机械蠕虫 +achievement.bossUFO.desc=哟,我们这儿有什么?一艘巨大的宇宙飞船正开向我们的星球? +achievement.bossUFO=Ayy Lmao achievement.c20_5.desc=??? achievement.c20_5=第20.5章 achievement.c44.desc=镀锌!我是说,锌! achievement.c44=第四十四章 achievement.chemistry.desc=Bobmazon 3级 (混凝土砖) achievement.chemistry=化学 +achievement.digammaFeel.desc=内心的空虚 +achievement.digammaFeel=感觉的恐惧 +achievement.digammaKauaiMoho.desc=一切都糟透了,这里有些热巧克力 +achievement.digammaKauaiMoho=歌唱,为我歌唱《Kauai Moho》 +achievement.digammaKnow.desc=关于这个世界 +achievement.digammaKnow=知晓的恐惧 +achievement.digammaSee.desc=坠入深渊 +achievement.digammaSee=可见的恐惧 +achievement.digammaUpOnTop.desc=仰慕我的儿子,他是我的克隆人. +achievement.digammaUpOnTop=仰慕我,仰慕我的家 achievement.fiend.desc=卑鄙 achievement.fiend2.desc=更卑鄙 achievement.fiend2=残忍2:更残忍 achievement.fiend=残忍 achievement.freytag.desc=Herold's life guards achievement.freytag=Freytag -achievement.hidden.desc=当你身上着火且辐射吸收量大于250RAD时使用一节坠落的车厢杀死一只末影人 +achievement.hidden.desc=使用一节坠落的车厢杀死一只污染苦力怕 achievement.hidden=隐藏目录 achievement.horizonsBonus.desc=说实话,你到底怎么了 achievement.horizonsBonus=地平线! @@ -57,6 +58,8 @@ achievement.potato.desc=你居然捅我!你怎—喔哦哦哦哦哦! achievement.potato=流氓AI achievement.radDeath.desc=居里夫人开创了放射性理论、放射性治疗和放射性死亡。。。。 achievement.radDeath=噢, 辐射! +achievement.radium.desc=你 因 为 往 我 的 咖 啡 里 倒 镭 而 被 解 雇 了 ! +achievement.radium=不可思议先生 achievement.radPoison.desc=受辐射中毒的影响 achievement.radPoison=呀, 辐射! achievement.sacrifice.desc=直面火海并存活 @@ -65,17 +68,20 @@ achievement.selenium.desc=Yeah. achievement.selenium=XVIII 月亮女神 achievement.stratum.desc=快刹车, Mitts! achievement.stratum=岩层 +achievement.someWounds.desc=准备好 +achievement.someWounds=有些伤口永远无法愈合 achievement.soyuz.desc=变得松脆 achievement.soyuz=土豆烹饪 achievement.space.desc=屡试屡败,浪费了价值9000万美元的资金 achievement.space=最后战线-呃,算了吧 achievement.tasteofblood.desc=这不是任何测试的一部分 achievement.tasteofblood=血的味道 - armor.blastProtection=修正 %s 的爆炸伤害 armor.cap=伤害上限 %s armor.damageModifier=修正 %s 对 %s 的伤害 armor.electricJetpack=离子喷射背包 +armor.explosionImmune=免疫除爆炸伤害外的一切伤害 +armor.fastFall=快速降落 armor.fireproof=防火 armor.fullSetBonus=全套效果: armor.geigerHUD=盖革计数器HUD @@ -83,11 +89,81 @@ armor.geigerSound=盖革计数器警报 armor.glider=滑翔 armor.gravity=重力修正 %s armor.hardLanding=硬着陆 +armor.ignoreLimit=防御值不受防御值上限的影响 armor.modifier=伤害修正 %s armor.nullDamage=免疫 %s 伤害 +armor.rocketBoots=火箭靴 +armor.sprintBoost=冲刺辅助加速 armor.thermal=热成像 armor.threshold=伤害阈值 %s -armor.vats=抬头显示器(HUD) +armor.vats=这是一个测试,以证明这些书的e[B]ic换行功能。字体比例是可自定义的,换行符也会相应调整,这使得编写新页面非常容易。 +book.test.cover=停车坐爱枫林晚 +book.test.page1=测试页面1 +book.rbmk.cover=$我的第一个$RBMK石墨式反应堆:$建造一个$反应堆$的基础知识 +book.rbmk.title1=介绍 +book.rbmk.page1=§lRBMK石墨式反应堆§r是一个完全模块化的核反应堆. 与大多数其他反应堆不同的是, 该反应堆没有"多方块结构核心"和尺寸上的限制, 而反应堆的性能和效率仅取决于你是如何建造它的, 以及各个组件如何相互作用. +book.rbmk.title2=热量 +book.rbmk.page2=当反应堆运行时, 它将会产生 §l热量§r. 热量会在各个组件之间扩散, 并在这个过程中会慢慢减少. 我们的目标是在不让反应堆熔化的情况下 产生尽可能多的热量, 并将热量传递到蒸汽管道中, 从而冷却反应堆并产生蒸汽. +book.rbmk.title3=燃料棒 +book.rbmk.page3=反应堆中的 §l燃料棒§r 将捕获周围的中子, 使棒内的燃料发生核反应, 并在此过程中释放中子. 中子会向四个方向释放, 最大释放范围为5格. 释放中子量的多少取决于所用的核燃料. +book.rbmk.title4=控制棒 +book.rbmk.page4=反应堆中的 §l控制棒§r 将减少中子通过它的数量. 完全插入时, 它会阻挡所有中子; 当插入一半时, 它只会阻挡一半中子. 控制棒用于调节反应堆的活跃状态和使其关闭. +book.rbmk.title5=控制棒 - 使用 +book.rbmk.title5.scale=0.9 +book.rbmk.page5=当前控制棒插入的程度将显示在GUI的中心. 边的彩色按钮将把控制棒添加到不同的颜色组中, 这对于在 §lRBMK石墨式反应堆§r 控制台上快速选择屏幕上不同区域的控制棒非常有用. 右侧的按钮允许您以每次25%的增量手动插入. +book.rbmk.title6=自动控制棒 +book.rbmk.page6=§L自动控制棒§r 与常规控制棒几乎相同, 但它们不能手动调整, 而是根据当前温度来调整控制棒插入的程度. 使用哪种功能, 在多少的温度插入多少的深度必须被事先设定好. +book.rbmk.title7=蒸汽管道 +book.rbmk.page7=反应堆中的 §l蒸汽管道§r 是唯一能有效降低反应堆热水平的组件. 如果一个蒸汽管道组件的沸点高于其设定的蒸汽类型的沸点, 那么它将试图消耗尽可能多的水 并产生尽可能多的蒸汽来冷却到沸点以下. +book.rbmk.title8=碳化钨中子反射器 +book.rbmk.page8=反应堆中的 §l碳化钨中子反射器§r 将阻止中子的通过, 相反,中子将被反射回它们来自的燃料棒上. 这对于使用中子是有用的, 否则这些中子一旦离开反应堆就会被浪费掉. +book.rbmk.title9=硼中子吸收器 +book.rbmk.page9=§l硼中子吸收器§r 只是阻挡中子. 被吸收的中子不会产生热量,会被有效地吸收. 这有助于防止燃料棒发生过度反应从而超出临界值. +book.rbmk.title10=石墨慢化剂 +book.rbmk.page10=§l石墨慢化剂§r 把穿过它的快中子转换成慢中子. 大多数核燃料反应释放出快中子, 而引起裂变需要慢中子, 所以强烈建议使用慢化剂. +book.rbmk.title11=结构柱 +book.rbmk.page11=§l结构柱§r 对中子没有任何影响也没有任何特殊用途. 建议在没有其他合适组件的情况下用结构柱填充反应堆, 因为结构柱能够传热. +book.rbmk.title12=控制台 +book.rbmk.page12=§lRBMK石墨式反应堆控制台§r 允许你远程控制反应堆. 使用 §lRBMK石墨式反应堆连接装置记录反应堆§r 然后潜行右击控制台就能把反应堆和控制台连接起来. 一个控制台只能控制15x15个组件, 对于大型反应堆可以使用多个控制台. +book.rbmk.title13=控制台的使用 +book.rbmk.page13=单击屏幕上的组件将选择或取消选择它们. 使用彩色按钮,可以快速选择该颜色组中的所有控制棒. 按钮“A”将选择所有控制棒, “X”将取消选择所有控制棒. +book.rbmk.page14=在绿色框中输入一个介于0和100之间的数字, 然后按下旁边的按钮, 将所有选定的控制棒拔出程度设置到该位置. 按钮“AZ-5”将使所有控制棒完全插入. +book.rbmk.title15=核燃料 +book.rbmk.page15= §l核燃料§r 的反应取决于许多因素. 主要是 §l核燃料强度§r, §l氙中毒程度§r 和接收到的 §l中子数量§r. 氙元素会在核燃料的中子含量较低时积聚起来, 并在正常运行时燃烧殆尽. 中子的效率取决于其类型, 大多数核燃料 §l用慢中子轰击来裂变效果最好§r. +book.rbmk.title16=熔毁 +book.rbmk.page16=§4§l尽量避免发生, 你不会想让这样一场核灾难发生在你的存档或服务器里的. +#book.rbmk.cover=HOW 2 RBMK:$The Basics$of Reactor$Construction +#book.rbmk.title1=Introduction +#book.rbmk.page1=The §lRBMK§r is a fully modular nuclear reactor. Unlike most other reactors, there is no "core", and no size limitations, rather, the behavior and efficiency of the reactor comes from how it is built and how the different pieces interact with each other. +#book.rbmk.title2=Heat +#book.rbmk.page2=As the reactor operates, it will generate §lheat§r. Heat will spread between parts, slowly decreasing in the process. The goal is to produce as much heat as possible without melting the reactor, and to move that heat to a §lsteam channel§r which cools the reactor and produces steam. +#book.rbmk.title3=Fuel Rod +#book.rbmk.page3=The §lfuel rod§r will capture neutron flux, causing the fuel inside the fuel rod to react, giving off neutrons in the process. Neutrons are released in all four cardinal directions with a maximum range of 5 blocks. The amount of neutrons released depends on the §lfuel§r used. +#book.rbmk.title4=Control Rod +#book.rbmk.page4=The §lcontrol rod§r will decrease the amount of neutrons passing though it. Fully inserted, it will block all neutrons, at half insertion, it will only block half. Control rods are used to regulate the reactor's activity and to turn it off. +#book.rbmk.title5=Control Rod - Usage +#book.rbmk.page5=The center of the GUI will display the current rod insertion. The colored buttons on the left will add a control rod to a color group, which is useful to quickly select grouped rods from the §lRBMK console§r. The buttons on the right allow for manual insertion in increments of 25%%. +#book.rbmk.title6=Automatic Control Rod +#book.rbmk.page6=§lAutomatic control rods§r function nearly identical to regular control rods, but they cannot be configured manually, instead they will adjust the rod position based on the current temperature. What function to use and how deep to insert at what temperature has to be defined first. +#book.rbmk.title7=Steam Channel +#book.rbmk.page7=The §lsteam channel§r is the only part that will actively reduce the reactor's heat level. If the component's temperature exceeds the boiling point of the set steam type, it will try to consume as much water and produce as much steam as needed to cool back below the boiling point. +#book.rbmk.title8=Neutron Reflector +#book.rbmk.page8=The §lneutron reflector§r will block neutrons from passing it, instead the neutrons will be reflected back at the fuel rod they came from. This is useful for utilizing neutrons that would otherwise be wasted by simply exiting the reactor. +#book.rbmk.title9=Neutron Absorber +#book.rbmk.page9=The §lneutron absorber§r will simply block neutrons. Neutrons absorbed will not generate heat and be effectively voided. This is useful to prevent fuel rods from reacting that would otherwise be in range. +#book.rbmk.title10=Graphite Moderator +#book.rbmk.page10=The §lgraphite moderator§r will convert fast neutrons passing through it into slow neutrons. Most fuels fission into fast neutrons while needing slow neutrons to split, so using moderators is strongly recommended. +#book.rbmk.title11=Structural Column +#book.rbmk.page11=The §lstructural column§r will not interfere with neutrons, nor does it have special uses. It is recommended to fill the reactor with structural columns where no other parts will be, because structural columns are capable of transporting heat. +#book.rbmk.title12=Console +#book.rbmk.page12=The §lRBMK console§r lets you control the reactor from afar. Using the §lRBMK§r §lconsole linking device§r on an RBMK part and then the console will link the reactor to the console. The console can only manage 15x15 parts, for larger reactors you might want to use multiple consoles. +#book.rbmk.title13=Console Usage +#book.rbmk.page13=Clicking on the parts will select and deselect them. Using the colored buttons, you can quickly select all control rods of that color group. Button 'A' will select all control rods, 'X' will deselect all. +#book.rbmk.page14=Entering a number 0-100 in the green box and then hitting the button next to it will set all selected control rods to this position. Button 'AZ-5' will cause all control rods to fully insert. +#book.rbmk.title15=Fuel +#book.rbmk.page15=The §lfuel§r's reactivity is based on multiple factors. The main ones are the §lenrichment§r, §lxenon poison§r and the amount of incoming §lneutrons§r. Xenon builds up when the fuel receives few neutrons and burns away during normal operation. The effectivity of neutrons depends on the type, most fuels §lsplit best with slow neutrons§r. +#book.rbmk.title16=Meltdown +#book.rbmk.page16=§4§lAvoid. chem.ASPHALT=沥青生产 chem.BALEFIRE=野火火箭燃料混合 chem.BP_BIOFUEL=生物燃料酯化 @@ -99,7 +175,11 @@ chem.CC_NAPHTHA=煤液化石脑油 chem.CC_OIL=煤液化 chem.CIRCUIT_4=超频电路生产 chem.CIRCUIT_5=高性能电路生产 +chem.COLTAN_CLEANING=钶钽铁矿提纯 +chem.COLTAN_CRYSTAL=钽结晶 +chem.COLTAN_PAIN=Pandemonium(III)钽铁溶液生产 chem.CONCRETE=混凝土生产 +chem.CONCRETE_ASBESTOS=石棉夹层混凝土生产 chem.COOLANT=冷却液混合 chem.CORDITE=无烟火药生产 chem.CRYOGEL=冷凝胶混合 @@ -150,11 +230,12 @@ chem.STEAM=烧水 chem.TEST=测试 chem.UF6=六氟化铀生产 chem.XENON=林德循环制氙 +chem.XENON_OXY=增强林德循环制氙 chem.YELLOWCAKE=黄饼生产 - container.amsBase=AMS基座 [开发中] container.amsEmitter=AMS发射极 [开发中] container.amsLimiter=AMS稳能器 [开发中] +container.anvil=砧 container.arcFurnace=电弧炉 container.armorTable=装甲改装台 container.assembler=装配机 @@ -166,6 +247,7 @@ container.chemplant=化工厂 container.compactLauncher=紧凑型发射台 container.crateIron=铁箱 container.crateSteel=钢箱 +container.crateTungsten=钨箱 container.crystallizer=矿物酸化器 container.cyclotron=回旋加速器 container.dfcCore=暗核聚变堆核心 @@ -200,6 +282,7 @@ container.machineLargeTurbine=工业汽轮机 container.machineRefinery=炼油厂 container.machineSelenium=星型发动机 container.machineShredder=粉碎机 +container.machineSILEX=SILEX container.machineTurbine=汽轮机 container.machineTurbofan=涡扇发动机 container.machine_deuterium=氘提取器 @@ -216,7 +299,7 @@ container.nukeFurnace=核熔炉 container.nukeGadget=小玩意 container.nukeMan=胖子 container.nukeMike=常青藤迈克 -container.nukeN2=N²炸弹 +container.nukeN2=N2炸弹 container.nukeN45=N45水雷 container.nukePrototype=原型 container.nukeSolinium=蔚蓝洗礼 @@ -230,6 +313,12 @@ container.radGen=辐射能量发电机 container.radar=雷达 container.radiobox=FM发射机 container.radiorec=FM收音机 +container.rbmkBoiler=RBMK石墨式反应堆蒸汽管道 +container.rbmkControl=RBMK石墨式反应堆控制棒 +container.rbmkControlAuto=RBMK石墨式反应堆自动控制棒 +container.rbmkOutgasser=RBMK石墨式反应堆辐照通道 +container.rbmkReaSim=RBMK石墨式反应堆燃料棒 (ReaSim) +container.rbmkRod=RBMK石墨式反应堆燃料棒 container.reactor=增殖反应堆 container.reactorControl=反应堆遥控模块 container.reactorLarge=大型核反应堆 @@ -243,15 +332,24 @@ container.satLinker=卫星ID管理 container.siren=警报器 container.soyuzCapsule=货物着陆舱 container.soyuzLauncher=联盟号发射平台 +container.storageDrum=核废料处理桶 container.teleLinker=炮塔ID管理 container.teleporter=传送机 +container.turretChekhov=重机枪炮塔“契诃夫的枪” +container.turretFriendly=轻机枪炮塔“友好先生” +container.turretFritz=重型火焰喷射器炮塔”弗里茨” +container.turretHoward=双联守门员近防系统“霍华德” +container.turretJeremy=重炮炮塔“杰里米” +container.turretMaxwell=高能微波炮塔”麦克斯韦” +container.turretRichard= 火箭炮塔“理查德” +container.turretTauon=陶子发射器炮塔“陶恩” container.uf6_tank=六氟化铀储罐 container.wasteDrum=乏燃料池 container.watzPowerplant=Watz发电厂 - death.attack.acid=%1$s 掉进了酸里 death.attack.ams=%1$s 沐浴在尚未被人类科学命名的致命粒子中 death.attack.amsCore=%1$s 在奇点之火中蒸发 +death.attack.asbestos=%1$s现在有权获得经济补偿 death.attack.bang=%1$s 被炸成小块碎片 death.attack.blackhole=%1$s 粉身碎骨 death.attack.blender=%1$s 被切成小块 @@ -263,6 +361,7 @@ death.attack.cheater=%1$s 的肠子变成了燕麦(???) death.attack.chopperBullet=%1$s 被 %2$s 屠杀 death.attack.cloud=%1$s 像冰棒一样在太阳下融化 death.attack.cmb=%1$s 被 %2$s 搞得嘶嘶作响 +death.attack.digamma=%1$s 踏入深渊 death.attack.electricity=%1$s 被电死 death.attack.electrified=%1$s 被 %2$s 电死 death.attack.euthanized=%1$s 被 %2$s 安乐死 @@ -275,6 +374,7 @@ death.attack.laser=%1$s 被 %2$s 变成了灰烬 death.attack.lead=%1$s 死于铅中毒 death.attack.lunar=%1$s 忘记了给重要器官充电 death.attack.meteorite=%1$s 被来自外太空的陨石击中 +death.attack.monoxide=%1$s忘了换一氧化碳探测器的电池 death.attack.mudPoisoning=%1$s 死于毒泥浆中 death.attack.nuclearBlast=%1$s 被核爆炸飞 death.attack.pc=%1$s 在粉红色的云中变成了一个水坑 @@ -294,12 +394,16 @@ death.attack.taint=%1$s 死于恶性肿瘤 death.attack.tau=%1$s 被 %2$s 用带负电荷的陶子射穿 death.attack.tauBlast=%1$s 对XVL1456充能时间过长,被炸成碎片 death.attack.teleporter=%1$s 被传送到虚空 - +digamma.playerDigamma=玩家F-迪伽马辐照水平: +digamma.playerHealth=玩家所受F-迪伽马辐照影响: +digamma.playerRes=玩家F-迪伽马防护水平: +digamma.title=玩家F-迪伽马辐射自检器 entity.entity_cyber_crab.name=赛博螃蟹 entity.entity_elder_one.name=老鸭子 entity.entity_fucc_a_ducc.name=鸭子 entity.entity_ntm_fbi.name=FBI探员 entity.entity_ntm_radiation_blaze.name=核融元素 +entity.hbm.entity_ntm_ufo.name=火星入侵者飞船 entity.entity_mob_hunter_chopper.name=猎人直升机 entity.entity_mob_mask_man.name=面具人 entity.entity_mob_nuclear_creeper.name=核爆爬行者 @@ -311,17 +415,15 @@ entity.hbm.entity_balls_o_tron_seg.name=机械蠕虫 entity.hbm.entity_bullet.name=子弹 entity.hbm.entity_rocket.name=火箭弹 entity.hbm.entity_schrabnel.name=Schrabnel - fluid.acid_fluid=酸 fluid.mud_fluid=毒泥 fluid.schrabidic_fluid=Sa酸 fluid.toxic_fluid=绿色软泥 - geiger.chunkRad=当前区块辐射: +geiger.envRad=环境总辐射量: geiger.playerRad=玩家辐射: geiger.playerRes=辐射抗性: geiger.title=盖革计数器 - hadron.analysis=正在分析... hadron.buttonOn=分析室启动(如果存在) hadron.buttonOff=分析室关闭 @@ -334,6 +436,10 @@ hadron.modeLine=§e直线加速器模式:$加速器末端有分析室$更少的 hadron.noresult=无结果 hadron.progress=正在进行中... hadron.success=已完成! +hbm.key=HBM的核科技mod 热键 +hbm.key.toggleBack=开关 喷气背包 +hbm.key.toggleHUD=开关 HUD +hbm.key.reload=装弹 hbmfluid.acid=过氧化氢 hbmfluid.amat=反物质 hbmfluid.aschrab=反Sa326 @@ -361,6 +467,7 @@ hbmfluid.nitan=NITAN©100号超级燃料 hbmfluid.none=无 hbmfluid.oil=原油 hbmfluid.oxygen=液氧 +hbmfluid.pain=Pandemonium(III) 钽铁溶液 hbmfluid.petroil=汽油 hbmfluid.petroleum=石油气 hbmfluid.plasma_bf=野火等离子体 @@ -381,7 +488,6 @@ hbmfluid.ultrahotsteam=超浓密蒸汽 hbmfluid.water=水 hbmfluid.watz=毒泥浆 hbmfluid.xenon=氙气 - info.coil=线圈强度 info.templatefolder=需要使用机器模板文件夹创建 info.template_in=输入: @@ -393,7 +499,8 @@ info.template_time=生产耗时: item.ajr_boots.name=AJR 动力装甲靴子 item.ajr_helmet.name=AJR 动力装甲头盔 item.ajr_legs.name=AJR 动力装甲护腿 -item.ajr_plate.name=item.ajro_boots.name=AJR 动力装甲靴子 +item.ajr_plate.name=AJR 动力装甲胸甲 +item.ajro_boots.name=AJR动力装甲靴子 item.ajro_helmet.name=AJR 动力装甲头盔 item.ajro_legs.name=AJR 动力装甲护腿 item.ajro_plate.name=AJR 动力装甲胸甲 @@ -459,6 +566,9 @@ item.ammo_50bmg_ap.name=.50BMG子弹[AP] item.ammo_50bmg_chlorophyte.name=.50BMG子弹[叶绿] item.ammo_50bmg_du.name=.50BMG子弹[贫铀] item.ammo_50bmg_explosive.name=.50BMG子弹[高爆] +item.ammo_50bmg_flechette.name=.50 BMG镖形弹 +item.ammo_50bmg_flechette_am.name=.50 BMG镖形弹[含镅] +item.ammo_50bmg_flechette_po.name=.50 BMG镖形弹[含钋] item.ammo_50bmg_incendiary.name=.50BMG子弹[燃烧] item.ammo_50bmg_phosphorus.name=.50BMG子弹[白磷] item.ammo_50bmg_sleek.name=.50BMG子弹[IF-R&D] @@ -491,10 +601,14 @@ item.ammo_9mm_ap.name=9mm子弹[AP] item.ammo_9mm_chlorophyte.name=9mm子弹[叶绿] item.ammo_9mm_du.name=9mm子弹[贫铀] item.ammo_9mm_rocket.name=9mm火箭弹 - item.ammo_cell.name=能量单元 item.ammo_container.name=万能弹药盒 item.ammo_dart.name=塑料镖(凋零) +item.ammo_dart_nerf.name=NERF 飞镖 +item.ammo_dgk.name=双联守门员近防系统200发弹药 +item.ammo_fireext.name=灭火器 水罐 +item.ammo_fireext_foam.name=灭火器 泡沫罐 +item.ammo_fireext_sand.name=灭火器 硼砂罐 item.ammo_folly.name=银弹 item.ammo_folly_du.name=银弹[贫铀, 不爆炸] item.ammo_folly_nuclear.name=银弹[核子] @@ -503,7 +617,6 @@ item.ammo_fuel_gas.name=毒气罐 item.ammo_fuel_napalm.name=凝固汽油罐 item.ammo_fuel_phosphorus.name=白磷罐 item.ammo_fuel_vaporizer.name=汽化罐 - item.ammo_grenade.name=40mm榴弹 item.ammo_grenade_concussion.name=40mm榴弹[震荡] item.ammo_grenade_finned.name=40mm榴弹[尾翼稳定] @@ -515,20 +628,20 @@ item.ammo_grenade_phosphorus.name=40mm榴弹[白磷] item.ammo_grenade_sleek.name=40mm榴弹[IF-R&D] item.ammo_grenade_toxic.name=40mm榴弹[化学] item.ammo_grenade_tracer.name=40mm训练榴弹 - item.ammo_mirv.name=迷你MIRV item.ammo_mirv_high.name=迷你MIRV (高当量) item.ammo_mirv_low.name=迷你MIRV (低当量) item.ammo_mirv_safe.name=迷你MIRV (安全) -item.ammo_mirv_special.name=迷你MILV +item.ammo_mirv_special.name=迷你MIRV item.ammo_nuke.name=迷你核弹 item.ammo_nuke_high.name=迷你核弹 (高当量) item.ammo_nuke_low.name=迷你核弹 (低当量) -item.ammo_nuke_pumpkin.name=Pumpkin Bomb +item.ammo_nuke_pumpkin.name=南瓜炸弹 item.ammo_nuke_safe.name=迷你核弹 (安全) item.ammo_nuke_tots.name=迷你核弹 (幼体) item.ammo_rocket.name=84mm火箭弹 item.ammo_rocket_canister.name=84mm Rocket火箭弹[榴霰弹] +item.ammo_rocket_digamma.name=§4归 零§r item.ammo_rocket_emp.name=84mm火箭弹[EMP] item.ammo_rocket_glare.name=84mm火箭弹[红光] item.ammo_rocket_he.name=84mm火箭弹[HE] @@ -539,7 +652,11 @@ item.ammo_rocket_rpc.name=84mm火箭弹[飞行电锯] item.ammo_rocket_shrapnel.name=84mm火箭弹[破片] item.ammo_rocket_sleek.name=84mm火箭弹[IF-R&D] item.ammo_rocket_toxic.name=84mm火箭弹[化学] - +item.ammo_shell.name=240mm炮弹 +item.ammo_shell_apfsds_du.name=240mm 贫铀尾翼稳定脱壳穿甲弹 +item.ammo_shell_apfsds_t.name=240mm 钨心尾翼稳定脱壳穿甲弹 +item.ammo_shell_explosive.name=240mm 高爆炮弹 +item.ammo_shell_w9.name=240mm W9核子炮弹 item.ams_catalyst_aluminium.name=铝反应催化剂 item.ams_catalyst_beryllium.name=铍反应催化剂 item.ams_catalyst_blank.name=空白反应催化剂 @@ -565,7 +682,6 @@ item.ams_focus_booster.name=增压稳定器焦点 item.ams_focus_limiter.name=限制稳定器焦点 item.ams_lens.name=稳定透镜 item.ams_muzzle.name=激活射线发射极 - item.analyzer.name=分析仪 item.apple_euphemium.name=Ep苹果 item.apple_lead.name=铅苹果 @@ -573,12 +689,13 @@ item.apple_schrabidium.name=Sa326苹果 item.arc_electrode.name=石墨电极 item.arc_electrode_burnt.name=熔化电极 item.arc_electrode_desh.name=Desh电极 -item.armor_polish.name=亮甲™ 装甲抛光剂 +item.armor_polish.name=亮甲™装甲抛光剂 item.asbestos_boots.name=防火靴 item.asbestos_cloth.name=防火布 item.asbestos_helmet.name=防火头盔 item.asbestos_legs.name=防火护腿 item.asbestos_plate.name=防火胸甲 +item.ashglasses.name=防灰烬护目镜 item.assembly_556.name=5.56mm子弹[待装配] item.assembly_actionexpress.name=.50 AE子弹[待装配] item.assembly_calamity.name=.50 BMG子弹[待装配] @@ -597,10 +714,10 @@ item.assembly_steel.name=铅子弹[待装配] item.assembly_template.name=装配机模板: item.assembly_uzi.name=.22 LR子弹[待装配] item.attachment_mask.name=附加型防毒面具 +item.attachment_mask_mono.name=可接入式防一氧化碳面罩 item.australium_iii.name=MkIII寿命延长剂 item.australium_iv.name=MkIV寿命延长剂 item.australium_v.name=MkV寿命延长剂 - item.back_tesla.name=背负式特斯拉线圈 item.balefire_and_ham.name=火腿野火蛋 item.balefire_and_steel.name=野火打火石 @@ -643,13 +760,52 @@ item.battery_su_l.name=大型SU-电池 item.battery_trixite.name=杂牌Spark电池 item.beta.name=Bata测试版功能 item.big_sword.name=大剑 +item.billet_am_mix.name=反应堆级镅坯料 +item.billet_am241.name=镅-241坯料 +item.billet_am242.name=镅-242坯料 +item.billet_americium_fuel.name=镅燃料坯料 +item.billet_au198.name=金-198坯料 +item.billet_australium.name=奥斯坯料 +item.billet_australium_greater.name=富集奥斯坯料 +item.billet_australium_lesser.name=贫化奥斯坯料 +item.billet_balefire_gold.name=激活态金-198坯料 +item.billet_co60.name=钴-60坯料 +item.billet_hes.name=高浓缩度Sa326燃料坯料 +item.billet_les.name=低浓缩度Sa326燃料坯料 +item.billet_mox_fuel.name=MOX燃料坯料 +item.billet_neptunium.name=镎坯料 +item.billet_neptunium_fuel.name=镎核燃料坯料 +item.billet_po210be.name=钋210-铍坯料 +item.billet_polonium.name=钋坯料 +item.billet_pu_mix.name=反应堆级钋坯料 +item.billet_pu238.name=钚238坯料 +item.billet_pu238be.name=钚238-铍坯料 +item.billet_pu239.name=钚239坯料 +item.billet_pu240.name=钚240坯料 +item.billet_pu241.name=钚-241坯料 +item.billet_plutonium.name=钚坯料 +item.billet_plutonium_fuel.name=钚燃料坯料 +item.billet_ra226be.name=镭226-铍坯料 +item.billet_schrabidium.name=Sa326坯料 +item.billet_schrabidium_fuel.name= Sa326燃料坯料 +item.billet_solinium.name=Sa327坯料 +item.billet_technetium.name=锝-99坯料 +item.billet_th232.name=钍232坯料 +item.billet_thorium_fuel.name=钍燃料坯料 +item.billet_u233.name=铀233坯料 +item.billet_u235.name=铀235坯料 +item.billet_u238.name=铀238坯料 +item.billet_uranium.name=铀坯料 +item.billet_uranium_fuel.name=铀燃料坯料 +item.billet_yharonite.name=Yharonite坯料 item.biomass.name=生物质 item.biomass_compressed.name=压缩生物质 -item.bj_boots.name=月球钉靴 +item.bismuth_tool.name=磁力提取器 +item.bj_boots.name=§4月神§r钉靴 item.bj_helmet.name=热传感器眼罩 -item.bj_legs.name=月球控制护腿 -item.bj_plate.name=月球控制胸甲 -item.bj_plate_jetpack.name=月球控制胸甲 (带翼) +item.bj_legs.name=§4月神§r护腿 +item.bj_plate.name=§4月神§r胸甲 +item.bj_plate_jetpack.name=§4月神§r胸甲 (带翼) item.black_hole.name=微型黑洞 item.blade_meteorite.name=陨石刀 item.blade_titanium.name=钛扇片 @@ -674,11 +830,12 @@ item.bolt_dura_steel.name=高速钢螺栓 item.bolt_tungsten.name=钨螺栓 item.bomb_caller.name=空袭指示器 item.bomb_waffle.name=大规模杀伤性华夫饼 +item.book_guide.name=RBMK反应堆操作指导书 item.book_of_.name=车厢书 item.book_secret.name=3-596-50802-9 item.bottle2_empty.name=空瓶 -item.bottle2_fritz.name=Fritz可乐 -item.bottle2_fritz_special.name=第一Fritz可乐 +item.bottle2_fritz.name=弗里茨可乐 +item.bottle2_fritz_special.name=第一弗里茨可乐 item.bottle2_korl.name=Korl item.bottle2_korl_special.name=第一Korl item.bottle2_sunset.name=夕阳沙士 @@ -702,7 +859,6 @@ item.bucket_mud.name=一桶毒泥 item.bucket_schrabidic_acid.name=一桶Sa酸 item.bucket_toxic.name=一桶绿色软泥 item.burnt_bark.name=烧焦树皮 - item.can_bepis.name=白事 item.can_breen.name=布雷恩博士的私人珍藏 item.can_creature.name='生物'能量饮料 @@ -741,16 +897,16 @@ item.canned_fist.name=拳头罐头 item.canned_fried.name=炸鸡罐头 item.canned_hotdogs.name=热狗罐头 item.canned_jizz.name=FlimFlam工业™ 马奶罐头 -item.canned_kerosene.name=煤油 -item.canned_leftovers.name=剩菜 +item.canned_kerosene.name=煤油罐头 +item.canned_leftovers.name=剩菜罐头 item.canned_milk.name=罐装炼乳 item.canned_mystery.name=神秘肉类罐头 item.canned_napalm.name=凝固汽油罐头 item.canned_oil.name=机油罐头 -item.canned_pashtet.name=牛排 +item.canned_pashtet.name=牛排罐头 item.canned_pizza.name=意大利香肠比萨罐头 item.canned_recursion.name=循环罐头 -item.canned_spam.name=午餐肉 +item.canned_spam.name=SPAM斯帕姆午餐肉 item.canned_stew.name=蘑菇煲罐头 item.canned_tomato.name=番茄汤罐头 item.canned_tube.name=宇航员食品管 @@ -760,7 +916,7 @@ item.canteen_13.name=Vault13水壶 item.canteen_fab.name=极品伏特加 item.canteen_vodka.name=伏特加 item.cap_aluminium.name=铝盖 -item.cap_fritz.name=Fritz瓶盖 +item.cap_fritz.name=弗里茨瓶盖 item.cap_korl.name=Korl瓶盖 item.cap_nuka.name=核子可乐瓶盖 item.cap_quantum.name=樱桃味核子可乐瓶盖 @@ -787,6 +943,7 @@ item.catalyst_clay.name=黏土催化剂 item.cbt_device.name=CBT装置 item.cell_anti_schrabidium.name=反Sa326单元 item.cell_antimatter.name=反物质单元 +item.cell_balefire.name=气态野火单元 item.cell_deuterium.name=氘单元 item.cell_empty.name=空单元 item.cell_puf6.name=六氟化钚单元 @@ -797,6 +954,7 @@ item.centri_stick.name=便携离心机 item.centrifuge_element.name=离心元件 item.centrifuge_tower.name=离心塔 item.chainsaw.name=链锯 +item.cheese.name=奶酪 item.chemistry_template.name=化工厂模板: item.chernobylsign.name=辐射警告标志战斧 item.chlorine_pinwheel.name=氯气转轮 @@ -809,12 +967,17 @@ item.chopper_head.name=猎人直升机驾驶舱 item.chopper_tail.name=猎人直升机尾部 item.chopper_torso.name=猎人直升机主体 item.chopper_wing.name=猎人直升机翼片 +item.cinnebar.name=朱砂 item.circuit_aluminium.name=基础电路 +item.circuit_bismuth.name=多功能芯片组 +item.circuit_bismuth_raw.name=多功能芯片组组件 item.circuit_copper.name=增强电路 item.circuit_gold.name=超频电路 item.circuit_raw.name=基本电路组件 item.circuit_red_copper.name=高级电路 item.circuit_schrabidium.name=高性能电路 +item.circuit_tantalium.name=电容板 +item.circuit_tantalium_raw.name=电容板组件 item.circuit_targeting_tier1.name=军用级电路板[1级] item.circuit_targeting_tier2.name=军用级电路板[2级] item.circuit_targeting_tier3.name=军用级电路板[3级] @@ -822,6 +985,7 @@ item.circuit_targeting_tier4.name=军用级电路板[4级] item.circuit_targeting_tier5.name=军用级电路板[5级] item.circuit_targeting_tier6.name=军用级电路板[6级] item.cladding_desh.name=Desh覆层 +item.cladding_iron.name=铁覆层 item.cladding_lead.name=铅覆层 item.cladding_obsidian.name=黑曜石覆层 item.cladding_paint.name=铅涂料 @@ -866,8 +1030,14 @@ item.cmb_pickaxe.name=CMB钢镐 item.cmb_plate.name=CMB钢胸甲 item.cmb_shovel.name=CMB钢锹 item.cmb_sword.name=CMB钢剑 +item.coal_infernal.name=地狱煤炭 item.cobalt_axe.name=钴斧 item.cobalt_boots.name=钴靴子 +item.cobalt_decorated_axe.name=镶嵌钴斧 +item.cobalt_decorated_hoe.name=镶嵌钴锄 +item.cobalt_decorated_pickaxe.name=镶嵌钴镐 +item.cobalt_decorated_shovel.name=镶嵌钴锹 +item.cobalt_decorated_sword.name=镶嵌钴剑 item.cobalt_helmet.name=钴头盔 item.cobalt_hoe.name=钴锄 item.cobalt_legs.name=钴护腿 @@ -875,6 +1045,8 @@ item.cobalt_pickaxe.name=钴镐 item.cobalt_plate.name=钴胸甲 item.cobalt_shovel.name=钴锹 item.cobalt_sword.name=钴剑 +item.coffee.name=咖啡 +item.coffee_radium.name=加镭咖啡 item.coil_advanced_alloy.name=超导线圈 item.coil_advanced_torus.name=超导环形线圈 item.coil_copper.name=铜线圈 @@ -886,8 +1058,10 @@ item.coil_tungsten.name=加热线圈 item.coin_creeper.name=核爆爬行者硬币 item.coin_maskman.name=面具硬币 item.coin_radiation.name=辐射硬币 +item.coin_ufo.name=UFO硬币 item.coin_worm.name=机械蠕虫硬币 item.coke.name=焦炭 +item.coltan_tool.name=钶钽铁矿指针 item.combine_scrap.name=CMB钢废料 item.component_emitter.name=发射器组件 item.component_limiter.name=稳定器组件 @@ -895,9 +1069,12 @@ item.cordite.name=无烟线状火药 item.cotton_candy.name=放射性棉花糖 item.crate_caller.name=空投召唤器 item.crowbar.name=Mk.V开箱装置"物理学圣剑" +item.crucible.name=裁决剑 item.crystal_aluminium.name=铝晶体 item.crystal_beryllium.name=铍晶体 item.crystal_charred.name=烧焦的水晶 +item.crystal_coal.name=煤晶体 +item.crystal_cobalt.name=钴晶体 item.crystal_copper.name=铜晶体 item.crystal_diamond.name=钻石晶体 item.crystal_energy.name=能量晶体 @@ -906,6 +1083,7 @@ item.crystal_gold.name=金晶体 item.crystal_horn.name=水晶角 item.crystal_iron.name=铁晶体 item.crystal_lead.name=铅晶体 +item.crystal_lapis.name=青金石晶体 item.crystal_lithium.name=锂晶体 item.crystal_niter.name=硝石晶体 item.crystal_phosphorus.name=磷晶体 @@ -922,6 +1100,7 @@ item.crystal_trixite.name=赛瑞克晶体 item.crystal_tungsten.name=钨晶体 item.crystal_uranium.name=铀晶体 item.crystal_xen.name=人造X晶体 +item.cube_power.name=电子块 item.custom_amat.name=自定义核弹-反物质棒 item.custom_dirty.name=自定义核弹-核废料棒 item.custom_fall.name=自定义核弹-掉落升级 @@ -931,7 +1110,9 @@ item.custom_nuke.name=自定义核弹-铀棒 item.custom_schrab.name=自定义核弹-Sa326棒 item.custom_tnt.name=自定义核弹-炸药 item.cyclotron_tower.name=回旋加速器塔 - +item.debris_fuel.name=RBMK石墨式反应堆燃料块 +item.debris_graphite.name=热石墨块 +item.debris_metal.name=断裂金属棒 item.definitelyfood.name=完全不脏牌军粮 item.defuser.name=高科技拆弹装置 item.demon_core_closed.name=封闭的恶魔核心 @@ -950,6 +1131,15 @@ item.detonator_deadman.name=死亡雷管 item.detonator_laser.name=激光起爆器 item.detonator_multi.name=多发起爆器 item.diamond_gavel.name=钻石槌 +item.digamma_diagnostic.name=玩家F-迪伽马辐射自检器 +item.dns_boots.name=DNT双聚中子态素高科技全环境作战服靴子 +item.dns_legs.name=DNT双聚中子态素高科技全环境作战服护腿 +item.dns_helmet.name=DNT双聚中子态素高科技全环境作战服头盔 +item.dns_plate.name=DNT双聚中子态素高科技全环境作战服胸甲 +item.dnt_boots.name=双聚态中子素 靴子 +item.dnt_legs.name=双聚态中子素 护腿 +item.dnt_helmet.name=双聚态中子素 头盔 +item.dnt_plate.name=双聚态中子素 胸甲 item.door_bunker.name=仓门 item.door_metal.name=金属门 item.door_office.name=办公室门 @@ -969,7 +1159,6 @@ item.dynosphere_euphemium_charged.name=Ep动力球[带电] item.dynosphere_schrabidium.name=Sa326动力球 item.dynosphere_schrabidium_charged.name=Sa326动力球[带电] item.dysfunctional_reactor.name=失控反应堆 - item.egg_balefire.name=野火蛋 item.egg_balefire.desc=什么样的鸟儿才会下带有放射性的蛋? item.egg_balefire_shard.name=野火蛋碎片 @@ -985,7 +1174,7 @@ item.euphemium_kit.name=Ep工具箱 item.euphemium_legs.name=Ep护腿 item.euphemium_plate.name=Ep胸甲 item.euphemium_stopper.name=Ep-阻滞者 - +item.fabsols_vodka.name=Fabsol伏特加 item.factory_core_advanced.name=高级工厂能源组件 item.factory_core_titanium.name=工厂能源组件 item.fallout.name=一堆辐射尘 @@ -999,6 +1188,7 @@ item.fins_flat.name=扁钢外壳 item.fins_quad_titanium.name=小型钛翼 item.fins_small_steel.name=小型钢栅格翼 item.fins_tri_steel.name=大型钢翼 +item.five_htp.name=5-羟色胺药丸 item.flame_conspiracy.name=阴谋论 item.flame_opinion.name=个人观点 item.flame_politics.name=政治话题 @@ -1015,14 +1205,18 @@ item.fluid_identifier.name=流体识别码 item.fluid_tank_empty.name=空通用流体罐 item.fluid_tank_full.name=通用流体罐: item.fluorite.name=氟石粉 -item.folly_bullet.name=12.8cm星辉弹头 -item.folly_bullet_du.name=12.8cm贫铀弹头 -item.folly_bullet_nuclear.name=12.8cm核弹头 +item.flywheel_beryllium.name=铍制飞轮 +item.fmn.name=氟硝西泮片 +item.folly_bullet.name=128mm星辉弹头 +item.folly_bullet_du.name=128mm贫铀弹头 +item.folly_bullet_nuclear.name=128mm核弹头 item.folly_shell.name=银弹壳 item.fooditem.name=食物 item.fragment_actinium.name=锕碎片 +item.fragment_boron.name=硼碎片 item.fragment_cerium.name=铈碎片 item.fragment_cobalt.name=钴碎片 +item.fragment_coltan.name=钶钽铁矿碎片 item.fragment_lanthanium.name=镧碎片 item.fragment_meteorite.name=陨石碎片 item.fragment_neodymium.name=钕碎片 @@ -1037,7 +1231,6 @@ item.fusion_shield_chlorophyte.name=叶绿金属聚变反应堆覆层 item.fusion_shield_desh.name=Desh聚变反应堆覆层 item.fusion_shield_tungsten.name=钨聚变反应堆覆层 item.fusion_shield_vaporwave.name=蒸汽波反应堆覆层 - item.gadget_core.name=钚核心 item.gadget_explosive.name=炸药 item.gadget_explosive8.name=炸药束 @@ -1048,9 +1241,12 @@ item.gas_empty.name=空气罐 item.gas_full.name=天然气罐 item.gas_mask.name=防毒面具 item.gas_mask_filter.name=防毒面具过滤器 +item.gas_mask_filter_mono.name=催化性面罩过滤器 item.gas_mask_m65.name=M65-Z防毒面具 +item.gas_mask_mono.name=防一氧化碳面罩 item.gas_petroleum.name=石油气罐 item.geiger_counter.name=手持盖革计数器 +item.gem_tantalium.name=钽晶体 item.generator_front.name=发电机前部 item.generator_steel.name=发电机主体 item.glitch.name=故障 @@ -1098,6 +1294,7 @@ item.grenade_smart.name=智能手榴弹 item.grenade_strong.name=增强型手榴弹 item.grenade_tau.name=陶子手榴弹 item.grenade_zomg.name=负能量湮灭手榴弹 +item.gun_ar15.name=阿玛莱特AR15式5.56mm自动步枪 item.gun_avenger.name=CZ57复仇者机枪 item.gun_b92.name=§9B92能量手枪§r item.gun_b92_ammo.name=§9B92能量单元§r @@ -1126,6 +1323,7 @@ item.gun_euthanasia.name=安乐死 item.gun_euthanasia_ammo.name=注射器 item.gun_fatman.name=M42核弹发射器 "胖子" item.gun_fatman_ammo.name=迷你核弹 +item.gun_fireext.name=灭火器 item.gun_flamer.name=喷射器 item.gun_flechette.name=弗莱彻突击步枪 item.gun_folly.name=Digamma原型"愚蠢" @@ -1136,7 +1334,7 @@ item.gun_immolator.name=焚烧者 item.gun_immolator_ammo.name=焚烧者燃料 item.gun_jack.name=汽锤 item.gun_jack_ammo.name=四联散弹子弹 -item.gun_karl.name=卡尔•古斯塔夫M3式84mm火箭筒 +item.gun_karl.name=卡尔-古斯塔夫M3式84mm火箭筒 item.gun_kit_1.name=枪械润滑油 item.gun_kit_2.name=枪械修理包 item.gun_ks23.name=KS-23霰弹枪 @@ -1155,6 +1353,7 @@ item.gun_mp.name=和平主义的机枪 item.gun_mp40.name=MP40冲锋枪 item.gun_mp40_ammo.name=冲锋枪子弹 item.gun_mp_ammo.name=小型无发射药机枪子弹 +item.gun_mymy.name=Nietes item.gun_osipr.name=标准型脉冲机枪 item.gun_osipr_ammo.name=暗能量脉冲弹 item.gun_osipr_ammo2.name=融合球 @@ -1186,9 +1385,9 @@ item.gun_revolver_saturnite.name=土星手枪 item.gun_revolver_schrabidium.name=Sa326左轮手枪 item.gun_revolver_schrabidium_ammo.name=Sa326左轮子弹 item.gun_revolver_silver.name=银质左轮手枪 -item.gun_rpg.name=卡尔•古斯塔夫M4无后座力炮 +item.gun_rpg.name=卡尔-古斯塔夫M4无后座力炮 item.gun_rpg_ammo.name=火箭弹 -item.gun_sauer.name=斯坦•索尔的猎枪 +item.gun_sauer.name=斯坦-索尔的猎枪 item.gun_skystinger.name=毒刺-The One Sky item.gun_spark.name=Spark Plug item.gun_spark_ammo.name=电磁弹 @@ -1207,7 +1406,6 @@ item.gun_uzi_silencer.name=带消音器的Uzi item.gun_xvl1456.name=XVL1456陶子加农炮原型机 item.gun_xvl1456_ammo.name=贫化铀235子弹 item.gun_zomg.name=奇点能湮灭射线“ZOMG炮” - item.hazmat_boots.name=防辐射靴 item.hazmat_boots_grey.name=高性能防辐射靴 item.hazmat_boots_red.name=高级防辐射靴 @@ -1232,6 +1430,7 @@ item.hazmat_plate_red.name=高级防辐射胸甲 item.hazmat_red_kit.name=高级防护套装 item.heart_booster.name=心之增强器 item.heart_container.name=心之容器 +item.heart_fab.name=心脏抗原结合器 item.heart_piece.name=心之碎片 item.hev_battery.name=套装电池 item.hev_boots.name=HEV Mark IV 靴子 @@ -1244,7 +1443,6 @@ item.hull_big_steel.name=大型钢壳 item.hull_big_titanium.name=大型钛壳 item.hull_small_aluminium.name=小型铝壳 item.hull_small_steel.name=小型钢壳 - item.igniter.name=点火器 item.industrial_magnet.name=工业磁铁 item.inf_antimatter.name=无限反物质罐 @@ -1258,9 +1456,18 @@ item.inf_water.name=无限水罐 item.ingot_actinium.name=半稳定锕锭 item.ingot_advanced_alloy.name=高级合金锭 item.ingot_aluminium.name=铝锭 +item.ingot_am_mix.name=反应堆级镅锭 +item.ingot_am241.name=镅-241锭 +item.ingot_am242.name=镅-242锭 +item.ingot_americium_fuel.name=镅燃料锭 item.ingot_asbestos.name=石棉板 +item.ingot_au198.name=金-198锭 item.ingot_australium.name=奥斯锭 item.ingot_beryllium.name=铍锭 +item.ingot_bismuth.name=铋锭 +item.ingot_boron.name=硼锭 +item.ingot_chainsteel.name=重链钢 +item.ingot_co60.name=钴-60锭 item.ingot_cobalt.name=钴锭 item.ingot_combine_steel.name=CMB钢锭 item.ingot_copper.name=工业级铜 @@ -1271,6 +1478,7 @@ item.ingot_dura_steel.name=高速钢锭 item.ingot_electronium.name=电素锭 item.ingot_euphemium.name=Ep锭 item.ingot_fiberglass.name=玻璃纤维 +item.ingot_graphite.name=石墨锭 item.ingot_hes.name=高浓度Sa326燃料锭 item.ingot_lanthanium.name=半稳定镧锭 item.ingot_lead.name=铅锭 @@ -1280,14 +1488,17 @@ item.ingot_meteorite.name=陨石锭 item.ingot_meteorite_forged.name=锻造陨石锭 item.ingot_mox_fuel.name=MOX燃料锭 item.ingot_neptunium.name=镎锭 +item.ingot_neptunium_fuel.name=白磷锭 item.ingot_phosphorus.name=白磷锭 item.ingot_plutonium.name=钚锭 item.ingot_plutonium_fuel.name=钚燃料锭 item.ingot_polonium.name=钋锭 item.ingot_polymer.name=聚合物锭 +item.ingot_pu_mix.name=反应堆级钚锭 item.ingot_pu238.name=钚238锭 item.ingot_pu239.name=钚239锭 item.ingot_pu240.name=钚240锭 +item.ingot_pu241.name=钚-241锭 item.ingot_red_copper.name=紫铜 item.ingot_reiium.name=雷恩锭 item.ingot_saturnite.name=土星锭 @@ -1297,9 +1508,12 @@ item.ingot_schrabidium_fuel.name=Sa326燃料锭 item.ingot_schraranium.name=低丰度Sa326锭 item.ingot_semtex.name=塞姆汀塑胶炸药块 item.ingot_solinium.name=Sa327锭 -item.ingot_starmetal.name=§9星辉锭§r +item.ingot_starmetal.name=§9星辉锭§r item.ingot_steel.name=钢锭 item.ingot_steel_dusted.name=粉末钢锭 +item.ingot_tantalium.name=钽锭 +item.ingot_tcalloy.name=锝-钢合金锭 +item.ingot_technetium.name=锝-99锭 item.ingot_th232.name=钍232锭 item.ingot_thorium_fuel.name=钍燃料锭 item.ingot_titanium.name=钛锭 @@ -1313,8 +1527,11 @@ item.ingot_uranium.name=铀锭 item.ingot_uranium_fuel.name=铀燃料锭 item.ingot_verticium.name=韦德赛锭 item.ingot_weidanium.name=魏丹锭 - +item.ingot_zirconium.name=锆块 +item.injector_5htp.name=5-HTP自动药物注射器 +item.injector_knife.name=8英寸刀片自动药物注射器 item.ink.name=林 墨水 +item.insert_doxium.name=掺砷Doxium插板 item.insert_du.name=贫铀插板 item.insert_era.name=反应装甲插板 item.insert_esapi.name=ESAPI插板 @@ -1331,12 +1548,13 @@ item.jetpack_break.name=缓降背包 item.jetpack_fly.name=喷气背包 item.jetpack_tank.name=喷气背包备用燃料罐 item.jetpack_vector.name=矢量喷气背包 - +item.journal_bj.name=被威士忌浸透的笔记本 +item.journal_pip.name=生存主义者日记 +item.journal_silver.name=承包商注释 item.key.name=钥匙 item.key_fake.name=伪造钥匙 item.key_kit.name=钥匙仿制套件 item.key_red.name=红色钥匙 - item.lead_gavel.name=铅槌 item.lemon.name="柠檬" item.letter.name=快捷邮件 @@ -1344,6 +1562,10 @@ item.levitation_unit.name=重力控制器 item.lignite.name=褐煤 item.limiter.name=发电机限制器 item.linker.name=链接器 +item.liquidator_boots.name=核废土清道夫套装靴子 +item.liquidator_helmet.name=核废土清道夫套装头盔 +item.liquidator_legs.name=核废土清道夫套装护腿 +item.liquidator_plate.name=核废土清道夫套装胸甲 item.lithium.name=锂锭 item.lodestone.name=磁石 item.loop_stew.name=程序猿专属早餐 @@ -1351,7 +1573,6 @@ item.loops.name=五彩麦圈 item.loot_10.name=10号导弹战利箱 item.loot_15.name=15号导弹战利箱 item.loot_misc.name=普通导弹战利箱 - item.magnet_circular.name=扁磁铁 item.magnet_dee.name=D型磁铁 item.magnetron.name=磁控管 @@ -1360,6 +1581,7 @@ item.man_explosive.name=炸药 item.man_explosive8.name=炸药束 item.man_igniter.name=点火器 item.man_kit.name=胖子 套件 +item.marshmallow.name=穿在木棍上的棉花糖 item.mask_of_infamy.name=耻辱面具 item.matchstick.name=火柴 item.mech_key.name=大号银钥匙 @@ -1374,6 +1596,8 @@ item.med_bag.name=医疗包 item.med_ipecac.name=吐根酊催吐剂 item.med_ptsd.name=PTSD治疗药物 item.med_schiziphrenia.name=抗精神分裂症药物 +item.medal_liquidator.name=核废土清道夫勋章 +item.meltdown_tool.name=达洛夫快速熔毁装置 item.memespoon.name=§ee花园园丁 item.memory.name=item.null.name item.mese_gavel.name=Mese槌 @@ -1397,7 +1621,8 @@ item.mike_deut.name=氘罐 item.mike_kit.name=常青藤麦克 套件 item.mirror_tool.name=定日镜调整工具 item.mirror_tool.linked=设置对齐位置! -item.mirror_tool.desc=右键单击“锅炉”以记忆位置 $再单击“定日镜”可将其转向锅炉item.missile_anti_ballistic.name=反弹道导弹 +item.mirror_tool.desc=右键单击“锅炉”以记忆位置 $再单击“定日镜”可将其转向锅炉 +item.missile_anti_ballistic.name=反弹道导弹 item.missile_assembly.name=小型导弹[待装配] item.missile_bhole.name=黑洞导弹 item.missile_burst.name=洲际导弹 @@ -1415,7 +1640,7 @@ item.missile_endo.name=吸热导弹 item.missile_exo.name=放热导弹 item.missile_generic.name=高爆导弹 item.missile_incendiary.name=燃烧导弹 -item.missile_incendiary_strong.name强化型燃烧导弹 +item.missile_incendiary_strong.name=强化型燃烧导弹 item.missile_inferno.name=Mk.II G.R.N.地狱导弹 item.missile_kit.name=导弹工具箱 item.missile_micro.name=战术核导弹 @@ -1554,9 +1779,10 @@ item.mp_warhead_15_balefire.name=15号野火弹头 item.mp_warhead_15_boxcar.name=15号 车厢? item.mp_warhead_15_he.name=15号HE弹头 item.mp_warhead_15_incendiary.name=15号燃烧弹头 -item.mp_warhead_15_n2.name=15号N²炸弹 +item.mp_warhead_15_n2.name=15号N2炸弹 item.mp_warhead_15_nuclear.name=15号核弹头 item.mp_warhead_15_nuclear_shark.name=15号核弹头 +item.mp_warhead_15_turbine.name=15号喷气发动机弹头 item.multi_kit.name=多用途炸弹 套件 item.multitool_beam.name=动力拳套[热射线] item.multitool_decon.name=动力拳套[净化] @@ -1569,17 +1795,34 @@ item.multitool_miner.name=动力拳套[采矿激光] item.multitool_silk.name=动力拳套[精准采集] item.multitool_sky.name=动力拳套[划破天际] item.mysteryshovel.name=易碎锹 - item.n2_charge.name=大型炸药 item.neutron_reflector.name=中子反射板 item.niter.name=硝石粉 item.nossy_hat.name=华丽的帽子 item.nothing.name=没有东西 item.nuclear_waste.name=核废料 +item.nuclear_waste_pearl.name=放射性珍珠 item.nuclear_waste_tiny.name=小撮核废料 +item.nuclear_waste_long.name=长半衰期核废料 +item.nuclear_waste_long_tiny.name=小撮长半衰期核废料 +item.nuclear_waste_long_depleted.name=腐化的长半衰期核废料 +item.nuclear_waste_long_depleted_tiny.name=小撮腐化的长半衰期核废料 +item.nuclear_waste_short.name=短半衰期核废料 +item.nuclear_waste_short_tiny.name=小撮短半衰期核废料 +item.nuclear_waste_short_depleted.name=腐化的短半衰期核废料 +item.nuclear_waste_short_depleted_tiny.name=小撮腐化的短半衰期核废料 item.nugget.name=鸡块 +item.nugget_am_mix.name=反应堆级镅粒 +item.nugget_am241.name=镅-241粒 +item.nugget_am242.name=镅-242粒 +item.nugget_americium_fuel.name=镅燃料粒 +item.nugget_au198.name=金-198粒 item.nugget_australium.name=奥斯粒 +item.nugget_australium_greater.name=富集奥斯粒 +item.nugget_australium_lesser.name=贫化奥斯粒 item.nugget_beryllium.name=铍粒 +item.nugget_bismuth.name=铋粒 +item.nugget_co60.name=钴-60粒 item.nugget_daffergon.name=达夫贡粒 item.nugget_desh.name=Desh粒 item.nugget_dineutronium.name=双聚中子态素粒 @@ -1590,16 +1833,22 @@ item.nugget_les.name=低浓度Sa326燃料粒 item.nugget_mercury.name=一滴水银 item.nugget_mox_fuel.name=MOX燃料粒 item.nugget_neptunium.name=镎粒 +item.nugget_neptunium_fuel.name=镎燃料粒 item.nugget_plutonium.name=钚粒 item.nugget_plutonium_fuel.name=钚燃料粒 item.nugget_polonium.name=钋粒 +item.nugget_pu_mix.name=反应堆级钚粒 item.nugget_pu238.name=钚238粒 item.nugget_pu239.name=钚239粒 item.nugget_pu240.name=钚240粒 +item.nugget_pu241.name=钚-241粒 +item.nugget_ra226.name=镭-226粒 item.nugget_reiium.name=魏丹粒 item.nugget_schrabidium.name=Sa326粒 item.nugget_schrabidium_fuel.name=Sa326燃料粒 item.nugget_solinium.name=Sa327粒 +item.nugget_tantalium.name=钽粒 +item.nugget_technetium.name=锝-99粒 item.nugget_th232.name=钍232粒 item.nugget_thorium_fuel.name=钍燃料粒 item.nugget_u233.name=铀233粒 @@ -1610,11 +1859,11 @@ item.nugget_uranium.name=铀粒 item.nugget_uranium_fuel.name=铀燃料粒 item.nugget_verticium.name=韦德赛粒 item.nugget_weidanium.name=魏丹粒 +item.nugget_zirconium.name=锆碎片 item.nuke_advanced_kit.name=原子学高级工具箱 item.nuke_commercially_kit.name=商用原子学工具箱 item.nuke_electric_kit.name=电子工程师工具箱 item.nuke_starter_kit.name=原子学入门工具箱 - item.oil_canola.name=菜籽油 item.oil_detector.name=石油探测仪 item.oil_detector.desc1=单击右键扫描地下是否存在油田 @@ -1624,7 +1873,6 @@ item.oil_detector.detected=附近存在油田 item.oil_detector.noOil=未发现油田 item.overfuse.name=奇异螺丝刀 item.oxy_mask.name=氧气面罩 - item.paa_boots.name=PaA "好鞋" item.paa_legs.name=PaA加固护腿 item.paa_plate.name=PaA加固护胸 @@ -1652,9 +1900,11 @@ item.particle_empty.name=空粒子胶囊 item.particle_higgs.name=希格斯玻色子胶囊 item.particle_hydrogen.name=氢离子胶囊 item.particle_lead.name=铅离子胶囊 +item.particle_lutece.name=Lutece准粒子 item.particle_muon.name=μ介子胶囊 item.particle_sparkticle.name=Spark粒子胶囊 item.particle_strange.name=奇夸克胶囊 +item.particle_tachyon.name=超光速粒子密封胶囊 item.peas.name=豌豆 item.pedestal_steel.name=钢底座 item.pellet_advanced.name=高级Watz性能增强剂 @@ -1662,7 +1912,7 @@ item.pellet_antimatter.name=反物质团 item.pellet_beryllium.name=铍慢化靶丸 item.pellet_buckshot.name=铅弹丸 item.pellet_canister.name=榴霰弹弹丸 -item.pellet_charged.name=电离粒子 +item.pellet_charged.name=电离粒子 item.pellet_chlorophyte.name=叶绿弹丸 item.pellet_claws.name=金属利爪 item.pellet_cluster.name=爆炸弹丸 @@ -1678,6 +1928,8 @@ item.pellet_mes.name=MES Watz靶丸 item.pellet_meteorite.name=陨石弹丸 item.pellet_neptunium.name=镎Watz靶丸 item.pellet_rtg.name=钚238放射性同位素燃料靶丸 +item.pellet_rtg_americium.name=镅-241放射性同位素燃料靶丸 +item.pellet_rtg_gold.name=金-1980放射性同位素燃料靶丸 item.pellet_rtg_polonium.name=钋210放射性同位素燃料靶丸 item.pellet_rtg_weak.name=贫铀放射性同位素燃料靶丸 item.pellet_schrabidium.name=纯Sa326Watz靶丸 @@ -1685,11 +1937,14 @@ item.photo_panel.name=光伏板 item.pill_iodine.name=碘丸 item.pin.name=发夹 item.pipes_steel.name=钢管 +item.pipes_steel.desc=为了逃税,所以造价如此高昂. item.piston_selenium.name=星型发动机活塞 item.plan_c.name=C计划 item.plate_advanced_alloy.name=高级合金板 item.plate_aluminium.name=铝板 item.plate_armor_ajr.name=铁皮装甲板 +item.plate_armor_dnt.name=DNT装甲板 +item.plate_armor_fau.name=Fau装甲板 item.plate_armor_hev.name=反应装甲板 item.plate_armor_lunar.name=月球镀层 item.plate_armor_titanium.name=钛装甲板 @@ -1717,20 +1972,30 @@ item.powder_advanced_alloy.name=高级合金粉 item.powder_aluminium.name=铝粉 item.powder_asbestos.name=石棉粉 item.powder_astatine.name=砹粉 +item.powder_at209.name=砹-209粉 +item.powder_au198.name=金-198粉 item.powder_australium.name=奥斯粉 item.powder_balefire.name=热核灰烬 item.powder_beryllium.name=铍粉 +item.powder_boron.name=硼粉 +item.powder_boron_tiny.name=小撮硼粉 item.powder_bromine.name=溴粉 item.powder_caesium.name=铯粉 item.powder_cerium.name=铈粉 item.powder_cerium_tiny.name=小撮铈粉 item.powder_chlorophyte.name=叶绿粉 item.powder_cloud.name=云粉末 +item.powder_co60.name=钴-60粉 item.powder_coal.name=煤粉 +item.powder_coal_tiny.name=小撮煤粉 item.powder_cobalt.name=钴粉 item.powder_cobalt_tiny.name=小撮钴粉 +item.powder_coltan.name=纯钽铁矿 +item.powder_coltan_ore.name=粉碎的钶钽铁矿石 item.powder_combine_steel.name=CMB钢粉 item.powder_copper.name=铜粉 +item.powder_cs137.name=铯-137粉 +item.powder_cs137_tiny.name=小撮铯-137粉 item.powder_daffergon.name=达夫贡粉 item.powder_desh.name=Desh粉 item.powder_desh_mix.name=Desh混合物 @@ -1742,6 +2007,8 @@ item.powder_emerald.name=绿宝石粉 item.powder_euphemium.name=Ep粉 item.powder_fire.name=火焰粉 item.powder_gold.name=金粉 +item.powder_i131.name=碘-131粉 +item.powder_i131_tiny.name=小撮碘-131粉 item.powder_ice.name=冷冻粉 item.powder_iodine.name=碘粉 item.powder_iron.name=铁粉 @@ -1777,6 +2044,7 @@ item.powder_spark_mix.name=Spark混合物 item.powder_steel.name=钢粉 item.powder_steel_tiny.name=小撮钢粉 item.powder_strontium.name=锶粉 +item.powder_tcalloy.name=锝-钢粉 item.powder_tennessine.name=Ts粉 item.powder_thermite.name=铝热剂 item.powder_thorium.name=钍粉 @@ -1786,7 +2054,10 @@ item.powder_unobtainium.name=难得素粉 item.powder_uranium.name=铀粉 item.powder_verticium.name=韦德赛粉 item.powder_weidanium.name=魏丹粉 +item.powder_xe135.name=氙-135粉 +item.powder_xe135_tiny.name=小撮氙-135粉 item.powder_yellowcake.name=黄饼 +item.powder_zirconium.name=锆粉 item.primer_357.name=.357马格南底火[x24] item.primer_44.name=.44马格南底火[x24] item.primer_50.name=大口径底火[x12] @@ -1794,12 +2065,69 @@ item.primer_9.name=小口径底火[x32] item.primer_buckshot.name=鹿弹底火[x12] item.prototype_kit.name=原型 套件 item.pudding.name=布丁 - item.quartz_plutonium.name=深成石英 item.radaway.name=消辐宁 item.radaway_flush.name=超级消辐宁 item.radaway_strong.name=强效消辐宁 item.radx.name=防辐射药 +item.rbmk_fuel_balefire.name=RBMK反应堆野火燃料棒 +item.rbmk_fuel_balefire_gold.name=RBMK反应堆激活态金-198燃料棒 +item.rbmk_fuel_drx.name=§cRBMK反应堆F迪伽马粒子燃料棒§r +item.rbmk_fuel_empty.name=空 RBMK反应堆燃料棒 +item.rbmk_fuel_hea242.name=HEA-242 RBMK反应堆高浓缩度镅-242燃料棒 +item.rbmk_fuel_heaus.name=HEAus RBMK反应堆高浓缩度奥斯燃料棒 +item.rbmk_fuel_hes.name=HES RBMK反应堆高浓缩度Sa-326燃料棒 +item.rbmk_fuel_hep.name=HEP-239 RBMK反应堆高浓缩度钚-239燃料棒 +item.rbmk_fuel_hep241.name=HEP-241 RBMK反应堆高浓缩度钚-241燃料棒 +item.rbmk_fuel_heu233.name=HEU-233 RBMK反应堆高浓缩度铀-233燃料棒 +item.rbmk_fuel_heu235.name=HEU-235 RBMK反应堆高浓缩度铀-235燃料棒 +item.rbmk_fuel_lea.name=LEA RBMK反应堆低浓缩度镅-242燃料棒 +item.rbmk_fuel_leaus.name=LEAus RBMK反应堆低浓缩度奥斯燃料棒 +item.rbmk_fuel_lep.name=LEP RBMK反应堆低浓缩度钚-239燃料棒 +item.rbmk_fuel_les.name=LES RBMK反应堆低浓缩度Sa-326燃料棒 +item.rbmk_fuel_mea.name=MEA RBMK反应堆中浓缩度镅-242燃料棒 +item.rbmk_fuel_men.name=MEN RBMK反应堆中浓缩度镎-237燃料棒 +item.rbmk_fuel_mep.name=MEP RBMK反应堆中浓缩度钚-239燃料棒 +item.rbmk_fuel_mes.name=MES RBMK中浓缩度Sa-326燃料棒 +item.rbmk_fuel_meu.name=MEU RBMK中浓缩度铀-235燃料棒 +item.rbmk_fuel_mox.name=MOX RBMK反应堆燃料棒 +item.rbmk_fuel_po210be.name=钋210-铍RBMK反应堆中子源 +item.rbmk_fuel_pu238be.name=钚238-铍RBMK反应堆中子源 +item.rbmk_fuel_ra226be.name=镭226-铍RBMK反应堆中子源 +item.rbmk_fuel_thmeu.name=ThMEU RBMK反应堆中浓缩度铀-235导向钍燃料棒 +item.rbmk_fuel_ueu.name=NU RBMK反应堆未浓缩铀燃料棒 +item.rbmk_lid.name=RBMK反应堆覆盖层 +item.rbmk_lid_glass.name=RBMK反应堆玻璃覆盖层 +item.rbmk_pellet_balefire.name=野火燃料芯块 +item.rbmk_pellet_balefire_gold.name=激活态金-198燃料芯块 +item.rbmk_pellet_drx.name=§cF迪伽马粒子燃料芯块§r +item.rbmk_pellet_hea242.name=HEA-242高浓缩度镅-242燃料芯块 +item.rbmk_pellet_heaus.name=HEAus高浓缩度奥斯燃料芯块 +item.rbmk_pellet_hep239.name=HEP-239高浓缩度钚-239燃料芯块 +item.rbmk_pellet_hep241.name=HEP-241高浓缩度钚-241燃料芯块 +item.rbmk_pellet_heu233.name=HEU-233高浓缩度铀-233燃料芯块 +item.rbmk_pellet_heu235.name=HEU-235高浓缩度铀-235燃料芯块 +item.rbmk_pellet_hes.name=HES高浓缩度Sa-326燃料芯块 +item.rbmk_pellet_lea.name=LEA低浓缩度镅-242燃料芯块 +item.rbmk_pellet_leaus.name=LEAus低浓缩度奥斯燃料芯块 +item.rbmk_pellet_lep.name=LEP低浓缩度钚-239燃料芯块 +item.rbmk_pellet_les.name=LES低浓缩度Sa-326燃料芯块 +item.rbmk_pellet_mea.name=MEA中浓缩度镅-242燃料芯块 +item.rbmk_pellet_men.name=MEN中浓缩度镎-237燃料芯块 +item.rbmk_pellet_mep.name=MEP中浓缩度钚-239燃料芯块 +item.rbmk_pellet_mes.name=MES中浓缩度Sa-326燃料芯块 +item.rbmk_pellet_meu.name=MEU中浓缩度铀-235燃料芯块 +item.rbmk_pellet_mox.name=MOX燃料芯块 +item.rbmk_pellet_po210be.name=钋210-铍中子源芯块 +item.rbmk_pellet_pu238be.name=钚238-铍中子源芯块 +item.rbmk_pellet_ra226be.name=镭226-铍中子源芯块 +item.rbmk_pellet_thmeu.name=ThMEU浓缩度铀-235导向钍燃料芯块 +item.rbmk_pellet_ueu.name=未浓缩铀燃料芯块 +item.rbmk_tool.name=RBMK石墨式反应堆控制台连接装置 +item.rbmk_tool.desc=按住Shift右击RBMK石墨式反应堆保存其坐标,$按住Shift右击控制台以连接反应堆! +item.rbmk_tool.linked=反应堆坐标已记录! +item.rbmk_tool.set=反应堆已连接! +item.reacher.name=钨长臂夹 item.reactor_core.name=增殖反应堆核心 item.reactor_sensor.name=反应堆遥感器 item.record.glass.desc=? ? ? @@ -1813,6 +2141,10 @@ item.reer_graar.name=The Reer Graar item.remote.name=损坏的遥控器 item.ring_pull.name=拉环 item.ring_starmetal.name=§9星辉拉环§r +item.robes_boots.name=战地靴 +item.robes_helmet.name=休闲兜帽 +item.robes_legs.name=休闲裤 +item.robes_plate.name=休闲毛衣 item.rocket_fuel.name=固体燃料[火箭推进剂] item.rod_australium.name=奥斯棒 item.rod_balefire.name=野火燃料棒 @@ -1927,13 +2259,12 @@ item.rune_hagalaz.name=粗催化剂基质 item.rune_isa.name=冷却催化剂基质 item.rune_jera.name=增殖催化剂基质 item.rune_thurisaz.name=添加剂催化剂基质 - item.sat_base.name=卫星基座 item.sat_chip.name=卫星ID芯片 item.sat_coord.name=卫星指示器 item.sat_foeq.name=实验型核能PEAF-Mk.I FOEQ Duna探测器 item.sat_gerald.name=Gerald建筑机器人 -item.sat_head_laser.name=死光 +item.sat_head_laser.name=死光发射器 item.sat_head_mapper.name=高增益光学摄像头 item.sat_head_radar.name=雷达天线 item.sat_head_resonator.name=Xenium共振器 @@ -1958,6 +2289,7 @@ item.schrabidium_shovel.name=Sa326锹 item.schrabidium_sword.name=Sa326剑 item.scrap.name=废料 item.screwdriver.name=螺丝刀 +item.scrumpy.name=一瓶烈性苹果酒 item.security_boots.name=防护靴子 item.security_helmet.name=防护头盔 item.security_legs.name=防护裤 @@ -1968,6 +2300,7 @@ item.seg_20.name=20号连接器 item.serum.name=血清 item.servo_set.name=伺服装置 item.servo_set_desh.name=Desh伺服装置 +item.shackles.name=枷锁 item.shimmer_axe.name=闪耀斧 item.shimmer_axe_head.name=重型斧头 item.shimmer_handle.name=强化聚合物手柄 @@ -1985,6 +2318,7 @@ item.solinium_igniter.name=Sa327脉冲点火器 item.solinium_kit.name=蔚蓝洗礼套件 item.solinium_propellant.name=Sa327压缩装药 item.sopsign.name=Sop标志战斧 +item.spawn_ufo.name=火星入侵者飞船 item.spawn_worm.name=机械蠕虫 item.sphere_steel.name=钢球 item.spider_milk.name=一瓶蜘蛛奶 @@ -2017,10 +2351,15 @@ item.stamp_titanium_circuit.name=钛质电路版锻模 item.stamp_titanium_flat.name=钛质锻模 item.stamp_titanium_plate.name=钛质板锻模 item.stamp_titanium_wire.name=钛质电线锻模 +item.starmetal_axe.name=星辉斧 item.starmetal_boots.name=星辉靴子 item.starmetal_helmet.name=星辉头盔 +item.starmetal_hoe.name=星辉锄 item.starmetal_legs.name=星辉护腿 +item.starmetal_pickaxe.name=星辉镐 item.starmetal_plate.name=星辉胸甲 +item.starmetal_shovel.name=星辉锹 +item.starmetal_sword.name=星辉剑 item.static_sandwich.name=TV三明治 item.stealth_boy.name=隐形装置 item.steel_axe.name=钢斧 @@ -2045,7 +2384,6 @@ item.syringe_metal_stimpak.name=治疗针 item.syringe_metal_super.name=超级治疗针 item.syringe_poison.name=毒针 item.syringe_taint.name=污染水注射液 - item.t45_boots.name=T45动力装甲 靴子 item.t45_helmet.name=T45动力装甲 头盔 item.t45_kit.name=T45动力装甲套装 @@ -2109,8 +2447,8 @@ item.turret_rocket_ammo.name=火箭炮塔弹药 item.turret_spitfire_ammo.name=防空炮弹 item.turret_tau_ammo.name=陶子炮塔铀弹药 item.twinkie.name=小蛋糕 - item.ullapool_caber.name=阿勒浦长木杆 +item.undefined.name=形态未定义物质 item.upgrade_afterburn_1.name=一级粉色机器升级 item.upgrade_afterburn_2.name=二级粉色机器升级 item.upgrade_afterburn_3.name=三级粉色机器升级 @@ -2138,7 +2476,6 @@ item.upgrade_speed_1.name=一级红色机器升级 item.upgrade_speed_2.name=二级红色机器升级 item.upgrade_speed_3.name=三级红色机器升级 item.upgrade_template.name=机器升级模板 - item.wand_d.name=调试魔杖 item.wand_k.name=建筑魔杖 item.wand_s.name=结构魔杖 @@ -2178,6 +2515,9 @@ item.weapon_pipe_rusty.name=姿态调节器 item.weapon_saw.name=肢解骨锯 item.weaponized_starblaster_cell.name=§c星际爆能电池§r item.wd40.name=VT-40 +item.wild_p.name=野生珀伽索斯干威士忌 +item.wings_limp.name=无力之翼 +item.wings_murk.name=暗黑之翼 item.wire_advanced_alloy.name=超导体 item.wire_aluminium.name=铝线 item.wire_copper.name=铜线 @@ -2190,17 +2530,48 @@ item.wiring_red_copper.name=电缆卷 item.wood_gavel.name=木槌 item.wrench.name=管道扳手 item.wrench_flipped.name=刺刀扳手 - +item.xanax.name= AXA抗Digamma药物 +item.zirconium_legs.name=锆质护腿 +itemGroup.tabBlocks=NTM 矿石和方块 +itemGroup.tabConsumable=HBM 食物和装备 +itemGroup.tabControl=HBM 机器项目和燃料 +itemGroup.tabMachine=HBM 机器 +itemGroup.tabMissile=HBM 导弹和卫星 +itemGroup.tabNuke=HBM 炸弹 +itemGroup.tabParts=HBM 资源和零件 +itemGroup.tabTemplate=NTM 模板 +itemGroup.tabTest=HBM的核科技mod测试项[S166、Bismarck、nukesteve联合汉化] +itemGroup.tabWeapon=HBM 武器和炮塔 potion.hbm_bang=! ! ! potion.hbm_lead=铅中毒 potion.hbm_mutation=变异 potion.hbm_phosphorus=磷烧伤 +potion.hbm_potionsickness=药水病 potion.hbm_radaway=消辐宁 potion.hbm_radiation=辐射 potion.hbm_radx=抗辐射 +potion.hbm_stability=稳定 potion.hbm_taint=污染 potion.hbm_telekinesis=! ! ! - +radar.detectMissiles=探测导弹 +radar.detectPlayers=探测玩家 +radar.redMode=红石控制模式$开启: 基于导弹距离输出红石信号$关闭: 基于导弹级别输出红石信号 +radar.smartMode=智能模式$有红石信号时忽略上升段的导弹 +rbmk.heat=柱体温度: %s +rbmk.boiler.water=供水速率: %s / %s +rbmk.boiler.steam=蒸汽产生速率: %s / %s +rbmk.boiler.type=蒸汽压缩等级: %s +rbmk.control.level=%s +rbmk.control.red=§c红色组 +rbmk.control.yellow=§e黄色组 +rbmk.control.green=§a绿色组 +rbmk.control.blue=§1蓝色组 +rbmk.control.purple=§5紫色组 +rbmk.moderated=慢化剂 +rbmk.rod.depletion=燃料消耗: %s +rbmk.rod.xenon=氙元素堆积程度: %s +rbmk.rod.coreTemp=核心温度: %s +rbmk.rod.skinTemp=表面温度: %s / %s tile.absorber.name=辐射吸收器 tile.absorber_green.name=高级辐射吸收器 tile.absorber_pink.name=精英辐射吸收器 @@ -2209,7 +2580,20 @@ tile.acid_block.name=酸 tile.ams_base.name=AMS基座 [开发中] tile.ams_emitter.name=AMS发射极 [开发中] tile.ams_limiter.name=AMS稳能器 [开发中] +tile.ancient_scrap.name=古代废金属 +tile.anvil_bismuth.name=铋砧 +tile.anvil_dnt.name=双聚中子态素砧 +tile.anvil_ferrouranium.name=铀-铁合金砧 +tile.anvil_iron.name=铁砧 +tile.anvil_lead.name=铅砧 +tile.anvil_meteorite.name=陨石砧 +tile.anvil_murky.name=暗黑砧 +tile.anvil_schrabidate.name=Sa-铁合金砧 +tile.anvil_starmetal.name=星辉金属砧 +tile.anvil_steel.name=钢砧 +tile.ash_digamma.name=灰烬 tile.asphalt.name=沥青 +tile.asphalt_light.name=发光沥青 tile.barbed_wire.name=带刺铁丝网 tile.barbed_wire_acid.name=腐蚀铁丝网 tile.barbed_wire_fire.name=烈焰铁丝网 @@ -2221,14 +2605,18 @@ tile.barrel_corroded.name=被腐蚀的桶 tile.barrel_iron.name=铁桶 tile.barrel_plastic.name=安全桶™ tile.barrel_steel.name=钢桶 +tile.barrel_tcalloy.name=锝-钢合金桶 tile.barricade.name=沙袋 tile.blast_door.name=防爆闸门 +tile.block_actinium.name=锕块 tile.block_advanced_alloy.name=高级合金块 tile.block_aluminium.name=铝块 tile.block_asbestos.name=石棉块 tile.block_australium.name=奥斯块 tile.block_beryllium.name=铍块 -tile.block_cap_fritz.name=Fritz瓶盖方块 +tile.block_bismuth.name=铋块 +tile.block_boron.name=硼块 +tile.block_cap_fritz.name=弗里茨瓶盖方块 tile.block_cap_korl.name=Korl瓶盖方块 tile.block_cap_nuka.name=核子可乐瓶盖方块 tile.block_cap_quantum.name=樱桃味核子可乐瓶盖方块 @@ -2237,8 +2625,11 @@ tile.block_cap_sparkle.name=核子可乐瓶盖方块 tile.block_cap_star.name=夕阳沙士星星瓶盖方块 tile.block_cap_sunset.name=夕阳沙士瓶盖方块 tile.block_cobalt.name=钴块 +tile.block_coltan.name=钽块 tile.block_combine_steel.name=CMB钢块 tile.block_copper.name=铜块 +tile.block_corium.name=熔融堆芯冷凝物 +tile.block_corium_cobble.name= 熔融物凝固石 tile.block_daffergon.name=达夫贡块 tile.block_desh.name=Desh块 tile.block_dineutronium.name=双聚中子态素块 @@ -2249,8 +2640,11 @@ tile.block_euphemium_cluster.name=Ep刻蚀Sa326团 tile.block_fallout.name=辐射尘块 tile.block_fiberglass.name=玻璃纤维卷 tile.block_fluorite.name=氟石块 +tile.block_foam.name=泡沫 tile.block_insulator.name=绝缘卷 +tile.block_graphite.name=石墨块 tile.block_lead.name=铅块 +tile.block_lanthanium.name=镧块 tile.block_lithium.name=锂块 tile.block_magnetized_tungsten.name=磁化钨块 tile.block_meteor.name=陨石块 @@ -2261,9 +2655,11 @@ tile.block_meteor_treasure.name=宝藏陨石块 tile.block_mox_fuel.name=MOX燃料块 tile.block_neptunium.name=镎块 tile.block_niter.name=硝石块 +tile.block_niter_reinforced.name=硝石加固块 tile.block_plutonium.name=钚块 tile.block_plutonium_fuel.name=钚燃料块 tile.block_polonium.name=钋块 +tile.block_pu_mix.name=反应堆级钚块 tile.block_pu238.name=钚238块 tile.block_pu239.name=钚239块 tile.block_pu240.name=钚240块 @@ -2276,14 +2672,17 @@ tile.block_schrabidium_cluster.name=Sa326团 tile.block_schrabidium_fuel.name=Sa326燃料块 tile.block_schraranium.name=低丰度Sa326块 tile.block_scrap.name=废品块 +tile.block_semtex.name=塞姆汀块 tile.block_solinium.name=Sa327块 tile.block_starmetal.name=星辉块 tile.block_steel.name=钢块 tile.block_sulfur.name=硫磺块 +tile.block_tantalium.name=钽块 tile.block_thorium.name=钍块 tile.block_thorium_fuel.name=钍燃料块 tile.block_titanium.name=钛块 tile.block_trinitite.name=玻璃石块 +tile.block_tritium.name=氚单元块 tile.block_tungsten.name=钨块 tile.block_u233.name=铀233块 tile.block_u235.name=铀U235块 @@ -2297,6 +2696,7 @@ tile.block_waste_painted.name=带标志的核废料块 tile.block_weidanium.name=魏丹块 tile.block_white_phosphorus.name=白磷块 tile.block_yellowcake.name=黄饼块 +tile.block_zirconium.name=锆块 tile.boat.name=船 tile.bomb_multi.name=多功能炸弹 tile.bomber.name=坠毁轰炸机 @@ -2307,6 +2707,7 @@ tile.brick_compound.name=复合网格砖块 tile.brick_concrete.name=混凝土砖块 tile.brick_concrete_broken.name=破混凝土砖块 tile.brick_concrete_cracked.name=裂混凝土砖块 +tile.brick_concrete_marked.name=标记混凝土砖 tile.brick_concrete_mossy.name=苔混凝土砖块 tile.brick_dungeon.name=硒铜砖 tile.brick_dungeon_circle.name=圆环硒铜块 @@ -2328,10 +2729,33 @@ tile.cable_switch.name=电源开关 tile.cheater_virus.name=冻结Ep tile.cheater_virus_seed.name=不稳定Ep Schrabide块 tile.chlorine_gas.name=氯气 +tile.cluster_aluminium.name=铝矿簇 +tile.cluster_depth_iron.name=深层铁矿簇 +tile.cluster_depth_titanium.name=深层钛矿簇 +tile.cluster_depth_tungsten.name=深层钨矿簇 +tile.cluster_iron.name=铁矿簇 +tile.cluster_titanium.name=钛矿簇 tile.cmb_brick.name=CMB钢瓦块 tile.cmb_brick_reinforced.name=加固CMB钢砖块 tile.compact_launcher.name=紧凑型发射台 tile.concrete.name=混凝土瓦块 +tile.concrete_asbestos.name=黑色混凝土 +tile.concrete_colored.black.name=黑色混凝土 +tile.concrete_colored.blue.name=蓝色混凝土 +tile.concrete_colored.brown.name=棕色混凝土 +tile.concrete_colored.cyan.name=青色混凝土 +tile.concrete_colored.gray.name=灰色混凝土 +tile.concrete_colored.green.name=绿色混凝土 +tile.concrete_colored.lightBlue.name=淡蓝色混凝土 +tile.concrete_colored.lime.name=黄绿色混凝土 +tile.concrete_colored.magenta.name=品红色混凝土 +tile.concrete_colored.orange.name=橙色混凝土 +tile.concrete_colored.pink.name=粉色混凝土 +tile.concrete_colored.purple.name=紫色混凝土 +tile.concrete_colored.red.name=红色混凝土 +tile.concrete_colored.silver.name=淡灰色混凝土 +tile.concrete_colored.white.name=白色混凝土 +tile.concrete_colored.yellow.name=黄色混凝土 tile.concrete_pillar.name=钢筋混凝土柱 tile.concrete_smooth.name=混凝土 tile.crashed_bomb.name=哑弹 @@ -2344,6 +2768,7 @@ tile.crate_lead.name=危险品补给箱 tile.crate_metal.name=机器补给箱 tile.crate_red.name=红色补给箱 tile.crate_steel.name=钢箱 +tile.crate_tungsten.name=钨箱 tile.crate_weapon.name=武器补给箱 tile.crystal_hardened.name=硬化黑水晶 tile.crystal_pulsar.name=脉动水晶 @@ -2353,6 +2778,30 @@ tile.deco_asbestos.name=石棉瓦 tile.deco_beryllium.name=铍装饰块 tile.deco_lead.name=铅装饰块 tile.deco_red_copper.name=紫铜装饰块 +tile.deco_pipe.name=钢制管道 +tile.deco_pipe_rusted.name=生锈的钢制管道 +tile.deco_pipe_green.name=绿色钢制管道 +tile.deco_pipe_green_rusted.name=生锈的绿色钢制管道 +tile.deco_pipe_red.name=红色钢制管道 +tile.deco_pipe_marked.name=气体管道 +tile.deco_pipe_framed.name=钢制管道 (镶框) +tile.deco_pipe_framed_rusted.name=生锈的钢制管道 (镶框) +tile.deco_pipe_framed_green.name=绿色钢制管道 (镶框) +tile.deco_pipe_framed_green_rusted.name=生锈的绿色钢制管道 (镶框) +tile.deco_pipe_framed_red.name=红色钢制管道 (镶框) +tile.deco_pipe_framed_marked.name=气体管道 (镶框) +tile.deco_pipe_quad.name=钢制管道束 +tile.deco_pipe_quad_rusted.name=生锈的钢制管道束 +tile.deco_pipe_quad_green.name=绿色钢制管道束 +tile.deco_pipe_quad_green_rusted.name=生锈的绿色钢制管道束 +tile.deco_pipe_quad_red.name=红色钢制管道束 +tile.deco_pipe_quad_marked.name=气体管道束 +tile.deco_pipe_rim.name=钢制管道 (镶边) +tile.deco_pipe_rim_rusted.name=生锈的钢制管道 (镶边) +tile.deco_pipe_rim_green.name=绿色钢制管道 (镶边) +tile.deco_pipe_rim_green_rusted.name=生锈的绿色钢制管道 (镶边) +tile.deco_pipe_rim_red.name=红色钢制管道 (镶边) +tile.deco_pipe_rim_marked.name=气体管道 (镶边) tile.deco_steel.name=钢装饰块 tile.deco_titanium.name=钛装饰块 tile.deco_tungsten.name=钨装饰块 @@ -2381,6 +2830,7 @@ tile.factory_titanium_furnace.name=工厂端口 tile.factory_titanium_hull.name=工厂外壳 tile.fallout.name=辐射尘 tile.fence_metal.name=铁丝网围栏 +tile.fire_digamma.name=挥之不去的迪伽玛之火 tile.fireworks.name=烟花箱 tile.fireworks.charges=已充能: %s tile.fireworks.message=信息: %s @@ -2388,6 +2838,7 @@ tile.fireworks.color=颜色: %s tile.flame_war.name=盒中论战 tile.float_bomb.name=悬浮炸弹 tile.fluid_duct.name=通用流体管道 +tile.foam_layer.name=泡沫层 tile.frozen_dirt.name=冰冻土 tile.frozen_grass.name=冰冻草 tile.frozen_log.name=冰冻原木 @@ -2406,9 +2857,18 @@ tile.fwatz_hatch.name=Watz聚变反应堆端口 tile.fwatz_plasma.name=不稳定反Sa326等离子体 tile.fwatz_scaffold.name=Watz聚变反应堆结构支架 tile.fwatz_tank.name=冷却液罐 +tile.gas_asbestos.name=石棉粉尘 tile.gas_duct.name=输气管道 tile.gas_duct_solid.name=密封输气管 +tile.gas_flammable.name=可燃气体 +tile.gas_monoxide.name=一氧化碳 +tile.gas_radon.name=氡气 +tile.gas_radon_dense.name=高浓度氡气 +tile.gas_radon_tomb.name=古墓气体 tile.geiger.name=盖革计数器 +tile.glass_ash.name=灰烬玻璃 +tile.glass_boron.name=硼玻璃 +tile.glass_lead.name=铅玻璃 tile.glass_polonium.name=钋玻璃 tile.glass_trinitite.name=核融玻璃 tile.glass_uranium.name=铀玻璃 @@ -2418,7 +2878,12 @@ tile.hadron_access.name=粒子加速器接入终端 tile.hadron_analysis.name=粒子加速器分析室壁 tile.hadron_analysis_glass.name=粒子加速器分析室窗口 tile.hadron_coil_alloy.name=密集超导线圈 +tile.hadron_coil_chlorophyte.name=致密叶绿线圈 +tile.hadron_coil_gold.name=致密金线圈 +tile.hadron_coil_magtung.name=致密4000K超导线圈 tile.hadron_coil_mese.name=密集Mese线圈 +tile.hadron_coil_neodymium.name=致密钕线圈 +tile.hadron_coil_schrabidate.name=致密Sa酸铁线圈 tile.hadron_coil_schrabidium.name=密集Sa326线圈 tile.hadron_coil_starmetal.name=密集星辉线圈 tile.hadron_core.name=粒子加速器核心组件 @@ -2431,8 +2896,28 @@ tile.hadron_plating_striped.name=粒子加速器镀层(低温危险) tile.hadron_plating_voltz.name=粒子加速器镀层 (VOLTZ) tile.hadron_plating_yellow.name=粒子加速器镀层(YelloDye) tile.hadron_power.name=粒子加速器电源接口 +tile.hadron_power_10m.name=粒子加速器电源接口(10MHE) +tile.hadron_power_100m.name=粒子加速器电源接口(100MHE) +tile.hadron_power_1g.name=粒子加速器电源接口(1GHE) +tile.hadron_power_10g.name=粒子加速器电源接口(10GHE) tile.hazmat.name=防辐射布块 +tile.hev_battery.name=盔甲电池 tile.iter.name=聚变反应堆 +tile.ladder_aluminium.name=铝制梯子 +tile.ladder_cobalt.name=钴制梯子 +tile.ladder_copper.name=铜制梯子 +tile.ladder_gold.name=金制梯子 +tile.ladder_iron.name=铁制梯子 +tile.ladder_lead.name=铅制梯子 +tile.ladder_steel.name=钢制梯子 +tile.ladder_sturdy.name=坚固木头制梯子 +tile.ladder_titanium.name=钛制梯子 +tile.ladder_tungsten.name=钨制梯子 +tile.lamp_demon.name=恶魔核心灯 +tile.lamp_tritium_blue_off.name=蓝色氚灯 +tile.lamp_tritium_blue_on.name=蓝色氚灯 +tile.lamp_tritium_green_off.name=绿色氚灯 +tile.lamp_tritium_green_on.name=绿色氚灯 tile.launch_pad.name=导弹发射台 tile.launch_table.name=大型发射台 tile.lox_barrel.name=液氧桶 @@ -2449,6 +2934,7 @@ tile.machine_boiler_off.name=锅炉 tile.machine_boiler_on.name=锅炉 tile.machine_centrifuge.name=离心机 tile.machine_chemplant.name=化工厂 +tile.machine_chungus.name=“利维坦”巨型汽轮机 tile.machine_coal_off.name=火力发电机 tile.machine_coal_on.name=火力发电机 tile.machine_combine_factory.name=CMB炼钢炉 @@ -2510,10 +2996,12 @@ tile.machine_schrabidium_battery.name=Sa326蓄电池 tile.machine_schrabidium_transmutator.name=Sa326嬗变装置 tile.machine_selenium.name=星型发动机 tile.machine_shredder.name=粉碎机 +tile.machine_silex.name=激光同位素分离室 tile.machine_siren.name=警报器 tile.machine_solar_boiler.name=太阳能锅炉 tile.machine_spp_bottom.name=ZPE电位发生器 [底部] tile.machine_spp_top.name=ZPE电位发生器 [顶部] +tile.machine_storage_drum.name=核废料处理桶 tile.machine_telelinker.name=炮塔ID管理器 tile.machine_teleporter.name=传送机 tile.machine_transformer.name=10k-20Hz变频器 @@ -2549,7 +3037,7 @@ tile.nuke_fstbmb.name=BF炸弹 tile.nuke_gadget.name=小玩意 tile.nuke_man.name=胖子 tile.nuke_mike.name=常青藤迈克 -tile.nuke_n2.name=N²炸弹 +tile.nuke_n2.name=N2炸弹 tile.nuke_n45.name=N45水雷 tile.nuke_prototype.name=原型 tile.nuke_solinium.name=蔚蓝洗礼 @@ -2561,10 +3049,15 @@ tile.ore_aluminium.name=铝矿石 tile.ore_asbestos.name=石棉矿 tile.ore_australium.name=奥斯矿石 tile.ore_beryllium.name=铍矿石 +tile.ore_cinnebar.name=朱砂矿石 tile.ore_coal_oil.name=含油煤矿石 tile.ore_coal_oil_burning.name=燃烧的含油煤矿石 +tile.ore_cobalt.name=Cobalt Ore +tile.ore_coltan.name=钶钽铁矿 tile.ore_copper.name=铜矿石 tile.ore_daffergon.name=达夫贡矿石 +tile.ore_depth_cinnebar.name=深层朱砂矿石 +tile.ore_depth_zirconium.name=深层锆矿石 tile.ore_fluorite.name=氟石矿石 tile.ore_gneiss_asbestos.name=石棉矿页岩 tile.ore_gneiss_copper.name=铜矿页岩 @@ -2589,6 +3082,7 @@ tile.ore_meteor_titanium.name=钛矿陨石 tile.ore_meteor_tungsten.name=钨矿陨石 tile.ore_meteor_uranium.name=铀矿陨石 tile.ore_nether_coal.name=燃烧下界煤矿 +tile.ore_nether_cobalt.name=Nether Cobalt Ore tile.ore_nether_fire.name=火矿石 tile.ore_nether_plutonium.name=下界钚矿石 tile.ore_nether_schrabidium.name=下界Sa326矿石 @@ -2623,10 +3117,29 @@ tile.plasma.name=等离子 tile.plasma_heater.name=等离子加热器 tile.pole_satellite_receiver.name=卫星天线 tile.pole_top.name=天线顶部 +tile.pribris.name=RBMK石墨式反应堆残骸 +tile.pribris_burning.name=燃烧的RBMK反应堆残骸 +tile.pribris_digamma.name=发黑的RBMK反应堆残骸 +tile.pribris_radiating.name=阴燃的RBMK反应堆残骸 tile.radiobox.name=无线怪物清除箱 tile.radiorec.name=坏掉的收音机 tile.rail_booster.name=高速动力轨道 tile.rail_highspeed.name=高速轨道 +tile.rbmk_absorber.name=RBMK反应堆硼中子吸收器 +tile.rbmk_blank.name=RBMK反应堆结构柱 +tile.rbmk_boiler.name=RBMK反应堆蒸汽管道 +tile.rbmk_console.name=RBMK石墨式反应堆控制台 +tile.rbmk_control.name=RBMK反应堆控制棒 +tile.rbmk_control_auto.name=RBMK反应堆自动控制棒 +tile.rbmk_control_mod.name= RBMK反应堆慢化控制棒 +tile.rbmk_loader.name=RBMK反应堆蒸汽导出器 +tile.rbmk_moderator.name=RBMK反应堆石墨慢化剂 +tile.rbmk_outgasser.name=RBMK反应堆辐照通道 +tile.rbmk_reflector.name=RBMK反应堆碳化钨中子反射器 +tile.rbmk_rod.name=RBMK反应堆燃料棒 +tile.rbmk_rod_mod.name= RBMK反应堆慢化燃料棒 +tile.rbmk_rod_reasim.name= RBMK反应堆燃料棒(ReaSim) +tile.rbmk_rod_reasim_mod.name= RBMK反应堆慢化燃料棒(ReaSim) tile.reactor_computer.name=反应堆控制器 tile.reactor_conductor.name=反应堆锅炉 tile.reactor_control.name=控制棒 @@ -2648,6 +3161,9 @@ tile.reinforced_stone.name=致密石头 tile.rejuvinator.name=再生装置 tile.residue.name=云残留 tile.safe.name=保险箱 +tile.sand_boron.name=硼砂 +tile.sand_boron_layer.name=硼砂层 +tile.sand_lead.name=铅砂 tile.sand_polonium.name=钋沙 tile.sand_uranium.name=铀沙 tile.sat_dock.name=卸货平台 @@ -2673,10 +3189,12 @@ tile.soyuz_launcher.name=联盟号发射平台 tile.spikes.name=地刺 tile.steel_beam.name=钢梁 tile.steel_corner.name=钢墙角 +tile.steel_grate.name=钢格栅 tile.steel_poles.name=钢杆 tile.steel_roof.name=钢天花顶 tile.steel_scaffold.name=钢脚手架 tile.steel_wall.name=钢墙 +tile.stone_depth.name=深层岩石 tile.stone_gneiss.name=石墨页岩 tile.struct_iter_core.name=聚变反应堆核心组件 tile.struct_launcher.name=发射台部件 @@ -2696,14 +3214,22 @@ tile.tile_lab.name=实验室瓷砖 tile.tile_lab_broken.name=破损实验室瓷砖 tile.tile_lab_cracked.name=开裂实验室瓷砖 tile.toxic_block.name=绿色软泥 -tile.turret_cheapo.name=奇普•加特林哨兵 +tile.turret_cheapo.name=奇普-加特林哨兵 +tile.turret_chekhov.name=重机枪炮塔“契诃夫的枪” tile.turret_cwis.name=Mk-15“密集阵”近防系统 tile.turret_flamer.name=喷火炮塔 +tile.turret_friendly.name=轻机枪炮塔“友好先生” +tile.turret_fritz.name=重型火焰喷射器炮塔“弗里茨” tile.turret_heavy.name=重型机枪炮塔 +tile.turret_howard.name=双联守门员近防系统“霍华德” +tile.turret_jeremy.name=重炮炮塔“杰里米” tile.turret_light.name=轻型机枪炮塔 +tile.turret_maxwell.name=高能微波炮塔 "麦克斯韦" tile.turret_rocket.name=火箭炮塔 +tile.turret_richard.name=火箭炮塔“理查德” tile.turret_spitfire.name=目前没有名字[开发中] tile.turret_tau.name=陶子炮塔 +tile.turret_tauon.name=XVL1456原型陶子发射器炮塔"陶恩" tile.vault_door.name=避难所防爆门 tile.vent_chlorine.name=氯气排气口 tile.vent_chlorine_seal.name=氯气容器 @@ -2724,33 +3250,70 @@ tile.watz_element.name=Watz反应室 tile.watz_end.name=Watz反应堆稳定元件 tile.watz_hatch.name=Watz反应堆端口 tile.yellow_barrel.name=核废料桶 - +trait.asbestos=石棉 trait.blinding=致盲 trait.breeding=可在增殖反应堆中工作 %s 次 trait.digamma=迪伽马辐射 trait.drop=掉落物危险 +trait.explosive=高度易燃/易爆 trait.furnace=可在核熔炉中工作 %s 次 trait.heat=提供 %s 热量 trait.hlParticle=粒子半衰期: %s trait.hlPlayer=玩家半衰期: %s trait.hot=自燃/高温 +trait.hydro=与水反应 trait.radioactive=放射性 trait.radResistance=辐射抗性: %s +trait.rbmk.coreTemp=核心温度: %s +trait.rbmk.depletion=燃料消耗: %s +trait.rbmk.diffusion=扩散度: %s +trait.rbmk.fluxFunc=中子放射函数: %s +trait.rbmk.funcType=中子放射函数类型: %s +trait.rbmk.heat=满功率时每tick产生的热量: %s +trait.rbmk.melt=熔点: %s +trait.rbmk.neutron.any=所有中子 +trait.rbmk.neutron.fast=快中子 +trait.rbmk.neutron.slow=慢中子 +trait.rbmk.skinTemp=表面温度: %s +trait.rbmk.source=自燃 +trait.rbmk.splitsInto=裂变后释放出: %s +trait.rbmk.splitsWith=裂变需要: %s +trait.rbmk.xenon=氙元素堆积程度: %s +trait.rbmk.xenonBurn=氙元素燃烧函数: %s +trait.rbmk.xenonGen=氙元素产生函数: %s +trait.rbmx.coreTemp=核心熵: %s +trait.rbmx.depletion=衰变: %s +trait.rbmx.diffusion=能量潮涌: %s +trait.rbmx.fluxFunc=F迪伽马粒子放射函数: %s +trait.rbmx.funcType=F迪伽马粒子放射函数类型: %s +trait.rbmx.heat=满功率时每tick产生的热量: %s +trait.rbmx.melt=崩溃深度: %s +trait.rbmk.neutron.any.x=所有非欧几里德形时空平面 +trait.rbmk.neutron.fast.x=椭圆非欧几里德形时空平面 +trait.rbmk.neutron.slow.x=双曲非欧几里德形时空平面 +trait.rbmx.skinTemp=表面熵: %s +trait.rbmx.source=自燃 +trait.rbmx.splitsInto=释放: %s +trait.rbmx.splitsWith=接受: %s +trait.rbmx.xenon=铅元素堆积程度: %s +trait.rbmx.xenonBurn=铅元素寂灭函数: %s +trait.rbmx.xenonGen=铅元素产生函数: %s +trait.tile.cluster=只有在被玩家破坏时才会掉落 +trait.tile.depth=只能被爆炸破坏 tool.ability.centrifuge=自动离心 tool.ability.crystallizer=自动结晶 tool.ability.explosion=爆破 tool.ability.hammer=范围挖掘 tool.ability.luck=时运 tool.ability.mercury=水银提取 +tool.ability.midas=点石成金 tool.ability.recursion=连锁挖矿 tool.ability.shredder=自动粉碎 tool.ability.silktouch=精准采集 tool.ability.smelter=自动熔炼 - weapon.ability.beheader=斩首 weapon.ability.chainsaw=痛苦面"锯" -# 翻译时应和"电锯"押韵 weapon.ability.radiation=辐射 weapon.ability.phosphorus=白磷刀刃 weapon.ability.stun=震撼 -weapon.ability.vampire=吸血 +weapon.ability.vampire=吸血 \ No newline at end of file diff --git a/src/main/resources/assets/hbm/textures/blocks/block_smore_side.png b/src/main/resources/assets/hbm/textures/blocks/block_smore_side.png new file mode 100644 index 000000000..f00014e1a Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/block_smore_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/block_smore_top.png b/src/main/resources/assets/hbm/textures/blocks/block_smore_top.png new file mode 100644 index 000000000..7c3aa4bdf Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/block_smore_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/depth_brick.png b/src/main/resources/assets/hbm/textures/blocks/depth_brick.png new file mode 100644 index 000000000..85f5f10e4 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/depth_brick.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/depth_tiles.png b/src/main/resources/assets/hbm/textures/blocks/depth_tiles.png new file mode 100644 index 000000000..5c58fda58 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/depth_tiles.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/gneiss_brick.png b/src/main/resources/assets/hbm/textures/blocks/gneiss_brick.png new file mode 100644 index 000000000..052a39831 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/gneiss_brick.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/gneiss_chiseled.png b/src/main/resources/assets/hbm/textures/blocks/gneiss_chiseled.png new file mode 100644 index 000000000..46524e090 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/gneiss_chiseled.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/gneiss_tile.png b/src/main/resources/assets/hbm/textures/blocks/gneiss_tile.png new file mode 100644 index 000000000..1c4aca54b Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/gneiss_tile.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/ore_depth_nether_neodymium.png b/src/main/resources/assets/hbm/textures/blocks/ore_depth_nether_neodymium.png new file mode 100644 index 000000000..2f808cf6d Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/ore_depth_nether_neodymium.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk_steam_inlet.png b/src/main/resources/assets/hbm/textures/blocks/rbmk_steam_inlet.png new file mode 100644 index 000000000..78264501b Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk_steam_inlet.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk_steam_outlet.png b/src/main/resources/assets/hbm/textures/blocks/rbmk_steam_outlet.png new file mode 100644 index 000000000..2713ffb61 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk_steam_outlet.png differ diff --git a/src/main/resources/assets/hbm/textures/items/bismuth_pickaxe.png b/src/main/resources/assets/hbm/textures/items/bismuth_pickaxe.png new file mode 100644 index 000000000..c8b90a262 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/bismuth_pickaxe.png differ diff --git a/src/main/resources/assets/hbm/textures/items/marshmallow_roasted.png b/src/main/resources/assets/hbm/textures/items/marshmallow_roasted.png new file mode 100644 index 000000000..5c136441e Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/marshmallow_roasted.png differ