diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 8b980c6d3..f35805a69 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -486,6 +486,7 @@ public class ModBlocks { public static Block rejuvinator; public static Block fireworks; public static Block dynamite; + public static Block tnt; public static Block charge_dynamite; public static Block charge_miner; @@ -1698,7 +1699,8 @@ public class ModBlocks { mine_he = new Landmine(Material.iron).setBlockName("mine_he").setCreativeTab(MainRegistry.nukeTab).setHardness(1.0F).setBlockTextureName(RefStrings.MODID + ":mine_he"); mine_shrap = new Landmine(Material.iron).setBlockName("mine_shrap").setCreativeTab(MainRegistry.nukeTab).setHardness(1.0F).setBlockTextureName(RefStrings.MODID + ":mine_shrap"); mine_fat = new Landmine(Material.iron).setBlockName("mine_fat").setCreativeTab(MainRegistry.nukeTab).setHardness(1.0F).setBlockTextureName(RefStrings.MODID + ":mine_fat"); - dynamite = new BlockDynamite().setBlockName("dynamite").setCreativeTab(MainRegistry.nukeTab).setHardness(1.0F).setBlockTextureName(RefStrings.MODID + ":dynamite"); + dynamite = new BlockDynamite().setBlockName("dynamite").setStepSound(Block.soundTypeGrass).setCreativeTab(MainRegistry.nukeTab).setHardness(0.0F).setBlockTextureName(RefStrings.MODID + ":dynamite"); + tnt = new BlockTNT().setBlockName("tnt_ntm").setStepSound(Block.soundTypeGrass).setCreativeTab(MainRegistry.nukeTab).setHardness(0.0F).setBlockTextureName(RefStrings.MODID + ":tnt"); machine_difurnace_off = new MachineDiFurnace(false).setBlockName("machine_difurnace_off").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); machine_difurnace_on = new MachineDiFurnace(true).setBlockName("machine_difurnace_on").setHardness(5.0F).setLightLevel(1.0F).setResistance(10.0F); @@ -2666,6 +2668,7 @@ public class ModBlocks { GameRegistry.registerBlock(crashed_balefire, crashed_balefire.getUnlocalizedName()); GameRegistry.registerBlock(fireworks, fireworks.getUnlocalizedName()); GameRegistry.registerBlock(dynamite, dynamite.getUnlocalizedName()); + GameRegistry.registerBlock(tnt, tnt.getUnlocalizedName()); //Turrets GameRegistry.registerBlock(turret_light, turret_light.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/bomb/BlockTNT.java b/src/main/java/com/hbm/blocks/bomb/BlockTNT.java new file mode 100644 index 000000000..ddb8fdbb5 --- /dev/null +++ b/src/main/java/com/hbm/blocks/bomb/BlockTNT.java @@ -0,0 +1,13 @@ +package com.hbm.blocks.bomb; + +import com.hbm.entity.item.EntityTNTPrimedBase; + +import net.minecraft.world.World; + +public class BlockTNT extends BlockTNTBase { + + @Override + public void explodeEntity(World world, double x, double y, double z, EntityTNTPrimedBase entity) { + world.createExplosion(entity, x, y, z, 12F, true); + } +} diff --git a/src/main/java/com/hbm/blocks/bomb/BlockTNTBase.java b/src/main/java/com/hbm/blocks/bomb/BlockTNTBase.java index 48ec12b5b..4bd824e32 100644 --- a/src/main/java/com/hbm/blocks/bomb/BlockTNTBase.java +++ b/src/main/java/com/hbm/blocks/bomb/BlockTNTBase.java @@ -2,33 +2,36 @@ package com.hbm.blocks.bomb; import java.util.Random; +import com.hbm.blocks.generic.BlockFlammable; import com.hbm.entity.item.EntityTNTPrimedBase; +import com.hbm.util.ChatBuilder; +import api.hbm.block.IToolable; +import api.hbm.block.IToolable.ToolType; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Items; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.world.Explosion; import net.minecraft.world.World; -public abstract class BlockTNTBase extends Block { - +public abstract class BlockTNTBase extends BlockFlammable implements IToolable { + @SideOnly(Side.CLIENT) private IIcon topIcon; @SideOnly(Side.CLIENT) private IIcon bottomIcon; public BlockTNTBase() { - super(Material.tnt); - this.setCreativeTab(CreativeTabs.tabRedstone); + super(Material.tnt, 15, 100); } @Override @@ -122,4 +125,33 @@ public abstract class BlockTNTBase extends Block { this.topIcon = p_149651_1_.registerIcon(this.getTextureName() + "_top"); this.bottomIcon = p_149651_1_.registerIcon(this.getTextureName() + "_bottom"); } + + @Override + public boolean onScrew(World world, EntityPlayer player, int x, int y, int z, int side, float fX, float fY, float fZ, ToolType tool) { + + if(tool == ToolType.DEFUSER) { + if(!world.isRemote) { + world.func_147480_a(x, y, z, true); + this.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); + } + return true; + } + + if(tool != ToolType.SCREWDRIVER) + return false; + + if(!world.isRemote) { + int meta = world.getBlockMetadata(x, y, z); + + if(meta == 0) { + world.setBlockMetadataWithNotify(x, y, z, 1, 3); + player.addChatComponentMessage(ChatBuilder.start("[ Ignite On Break: Enabled ]").color(EnumChatFormatting.RED).flush()); + } else { + world.setBlockMetadataWithNotify(x, y, z, 0, 3); + player.addChatComponentMessage(ChatBuilder.start("[ Ignite On Break: Disabled ]").color(EnumChatFormatting.GOLD).flush()); + } + } + + return true; + } } diff --git a/src/main/java/com/hbm/crafting/ToolRecipes.java b/src/main/java/com/hbm/crafting/ToolRecipes.java index 1df627b7d..43ff59f86 100644 --- a/src/main/java/com/hbm/crafting/ToolRecipes.java +++ b/src/main/java/com/hbm/crafting/ToolRecipes.java @@ -132,8 +132,10 @@ public class ToolRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.mirror_tool), new Object[] { " A ", " IA", "I ", 'A', AL.ingot(), 'I', IRON.ingot() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.rbmk_tool), new Object[] { " A ", " IA", "I ", 'A', PB.ingot(), 'I', IRON.ingot() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.kit_toolbox_empty), new Object[] { "CCC", "CIC", 'C', CU.plate(), 'I', IRON.ingot() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.screwdriver, 1), new Object[] { " I", " I ", "S ", 'S', STEEL.ingot(), 'I', IRON.ingot() }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.screwdriver_desh, 1), new Object[] { " I", " I ", "S ", 'S', DESH.ingot(), 'I', ANY_PLASTIC.ingot() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.screwdriver_desh, 1), new Object[] { " I", " I ", "S ", 'S', ANY_PLASTIC.ingot(), 'I', DESH.ingot() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.hand_drill), new Object[] { " D", "S ", " S", 'D', DURA.ingot(), 'S', KEY_STICK }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.hand_drill_desh), new Object[] { " D", "S ", " S", 'D', DESH.ingot(), 'S', ANY_PLASTIC.ingot() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.chemistry_set), new Object[] { "GIG", "GCG", 'G', KEY_ANYGLASS, 'I', IRON.ingot(), 'C', CU.ingot() }); diff --git a/src/main/java/com/hbm/crafting/WeaponRecipes.java b/src/main/java/com/hbm/crafting/WeaponRecipes.java index e7f7c306a..c5d2f8fef 100644 --- a/src/main/java/com/hbm/crafting/WeaponRecipes.java +++ b/src/main/java/com/hbm/crafting/WeaponRecipes.java @@ -349,7 +349,7 @@ public class WeaponRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_pink_cloud), new Object[] { " S ", "ECE", " E ", 'S', ModItems.powder_spark_mix, 'E', ModItems.powder_magic, 'C', ModItems.grenade_cloud }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.nuclear_waste_pearl), new Object[] { "WWW", "WFW", "WWW", 'W', ModItems.nuclear_waste_tiny, 'F', ModBlocks.block_fallout }); //CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_nuke), new Object[] { "CGC", "CGC", "PAP", 'C', ModBlocks.det_charge, 'G', ModItems.grenade_mk2, 'P', ALLOY.plate(), 'A', Blocks.anvil }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.stick_dynamite, 4), new Object[] { " S ", "PDP", "PDP", 'S', Items.string, 'P', Items.paper, 'D', ModItems.ball_dynamite }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.stick_dynamite, 4), new Object[] { " S ", "PDP", "PDP", 'S', ModItems.safety_fuse, 'P', Items.paper, 'D', ModItems.ball_dynamite }); //IF Grenades diff --git a/src/main/java/com/hbm/crafting/handlers/ToolboxCraftingHandler.java b/src/main/java/com/hbm/crafting/handlers/ToolboxCraftingHandler.java index f697c8eb6..761c59262 100644 --- a/src/main/java/com/hbm/crafting/handlers/ToolboxCraftingHandler.java +++ b/src/main/java/com/hbm/crafting/handlers/ToolboxCraftingHandler.java @@ -42,8 +42,10 @@ public class ToolboxCraftingHandler implements IRecipe { for(int i = 0; i < 9; i++) { ItemStack stack = inventory.getStackInRowAndColumn(i % 3, i / 3); - if(stack != null) { - stacks.add(stack); + if(stack != null && stack.getItem() != ModItems.kit_toolbox_empty) { + ItemStack copy = stack.copy(); + copy.stackSize = 1; + stacks.add(copy); } } diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index 61574c136..735d4c36d 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -381,12 +381,12 @@ public class OreDictManager { OreDictionary.registerOre(KEY_CRACK_TAR, fromOne(oil_tar, EnumTarType.CRACK)); OreDictionary.registerOre(KEY_COAL_TAR, fromOne(oil_tar, EnumTarType.COAL)); - OreDictionary.registerOre(KEY_TOOL_SCREWDRIVER, screwdriver); - OreDictionary.registerOre(KEY_TOOL_SCREWDRIVER, screwdriver_desh); - OreDictionary.registerOre(KEY_TOOL_HANDDRILL, hand_drill); - OreDictionary.registerOre(KEY_TOOL_HANDDRILL, hand_drill_desh); - OreDictionary.registerOre(KEY_TOOL_CHEMISTRYSET, chemistry_set); - OreDictionary.registerOre(KEY_TOOL_CHEMISTRYSET, chemistry_set_boron); + OreDictionary.registerOre(KEY_TOOL_SCREWDRIVER, new ItemStack(screwdriver, 1, OreDictionary.WILDCARD_VALUE)); + OreDictionary.registerOre(KEY_TOOL_SCREWDRIVER, new ItemStack(screwdriver_desh, 1, OreDictionary.WILDCARD_VALUE)); + OreDictionary.registerOre(KEY_TOOL_HANDDRILL, new ItemStack(hand_drill, 1, OreDictionary.WILDCARD_VALUE)); + OreDictionary.registerOre(KEY_TOOL_HANDDRILL, new ItemStack(hand_drill_desh, 1, OreDictionary.WILDCARD_VALUE)); + OreDictionary.registerOre(KEY_TOOL_CHEMISTRYSET, new ItemStack(chemistry_set, 1, OreDictionary.WILDCARD_VALUE)); + OreDictionary.registerOre(KEY_TOOL_CHEMISTRYSET, new ItemStack(chemistry_set_boron, 1, OreDictionary.WILDCARD_VALUE)); OreDictionary.registerOre(getReflector(), neutron_reflector); OreDictionary.registerOre("oreRareEarth", ore_rare); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 9298c00ea..8c67af6a0 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -306,6 +306,7 @@ public class ModItems { public static Item photo_panel; public static Item sat_base; public static Item thruster_nuclear; + public static Item safety_fuse; public static Item undefined; @@ -2629,6 +2630,7 @@ public class ModItems { photo_panel = new Item().setUnlocalizedName("photo_panel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":photo_panel"); sat_base = new Item().setUnlocalizedName("sat_base").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":sat_base"); thruster_nuclear = new Item().setUnlocalizedName("thruster_nuclear").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":thruster_nuclear"); + safety_fuse = new Item().setUnlocalizedName("safety_fuse").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":safety_fuse"); undefined = new ItemCustomLore().setUnlocalizedName("undefined").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":undefined"); @@ -6025,6 +6027,7 @@ public class ModItems { GameRegistry.registerItem(coil_gold_torus, coil_gold_torus.getUnlocalizedName()); GameRegistry.registerItem(coil_tungsten, coil_tungsten.getUnlocalizedName()); GameRegistry.registerItem(coil_magnetized_tungsten, coil_magnetized_tungsten.getUnlocalizedName()); + GameRegistry.registerItem(safety_fuse, safety_fuse.getUnlocalizedName()); GameRegistry.registerItem(tank_steel, tank_steel.getUnlocalizedName()); GameRegistry.registerItem(motor, motor.getUnlocalizedName()); GameRegistry.registerItem(motor_desh, motor_desh.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/special/ItemHoloTape.java b/src/main/java/com/hbm/items/special/ItemHoloTape.java index ffeff8b82..3d79e0245 100644 --- a/src/main/java/com/hbm/items/special/ItemHoloTape.java +++ b/src/main/java/com/hbm/items/special/ItemHoloTape.java @@ -6,5 +6,6 @@ public class ItemHoloTape extends ItemEnumMulti { public ItemHoloTape(Class theEnum, boolean multiName, boolean multiTexture) { super(theEnum, multiName, multiTexture); + this.setMaxStackSize(1); } } diff --git a/src/main/java/com/hbm/items/special/ItemKitNBT.java b/src/main/java/com/hbm/items/special/ItemKitNBT.java index a793c524e..e310c04de 100644 --- a/src/main/java/com/hbm/items/special/ItemKitNBT.java +++ b/src/main/java/com/hbm/items/special/ItemKitNBT.java @@ -1,13 +1,16 @@ package com.hbm.items.special; +import java.util.List; + import com.hbm.items.ModItems; import com.hbm.util.ItemStackUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; public class ItemKitNBT extends Item { @@ -32,17 +35,40 @@ public class ItemKitNBT extends Item { ItemStack container = stack.getItem().getContainerItem(stack); + stack.stackSize--; + if(container != null) { - player.inventory.addItemStackToInventory(container.copy()); + + if(stack.stackSize > 0) { + player.inventory.addItemStackToInventory(container.copy()); + } else { + stack = container.copy(); + } } - stack.stackSize--; + world.playSoundAtEntity(player, "hbm:item.unpack", 1.0F, 1.0F); return stack; } + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { + + ItemStack[] stacks = ItemStackUtil.readStacksFromNBT(stack); + + if(stacks != null) { + + list.add("Contains:"); + + for(ItemStack item : stacks) { + list.add("-" + item.getDisplayName()); + } + } + } + public static ItemStack create(ItemStack... contents) { - ItemStack stack = new ItemStack(ModItems.kit_custom); + ItemStack stack = new ItemStack(ModItems.kit_toolbox); stack.stackTagCompound = new NBTTagCompound(); ItemStackUtil.addStacksToNBT(stack, contents); diff --git a/src/main/java/com/hbm/items/tool/ItemCraftingDegradation.java b/src/main/java/com/hbm/items/tool/ItemCraftingDegradation.java index ee8019b13..58099e460 100644 --- a/src/main/java/com/hbm/items/tool/ItemCraftingDegradation.java +++ b/src/main/java/com/hbm/items/tool/ItemCraftingDegradation.java @@ -11,6 +11,16 @@ public class ItemCraftingDegradation extends Item { this.setMaxStackSize(1); this.setMaxDamage(durability); } + + @Override + public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) { + return false; + } + + @Override + public boolean hasContainerItem(ItemStack stack) { + return true; + } @Override public ItemStack getContainerItem(ItemStack stack) { diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 0791c0263..3b11f0f6b 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -24,7 +24,6 @@ import net.minecraft.enchantment.Enchantment; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.item.ItemDye; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.oredict.OreDictionary; @@ -782,6 +781,7 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.ingot_dineutronium, 8), new Object[] { "UUU", "UPU", "UUU", 'U', SBD.ingot(), 'P', new ItemStack(ModItems.particle_sparkticle).setStackDisplayName("Sparkticle (Temporary Recipe)") }); addRecipeAuto(new ItemStack(ModBlocks.fireworks, 1), new Object[] { "PPP", "PPP", "WIW", 'P', Items.paper, 'W', KEY_PLANKS, 'I', IRON.ingot() }); + addRecipeAuto(new ItemStack(ModItems.safety_fuse, 8), new Object[] { "SSS", "SGS", "SSS", 'S', Items.string, 'G', Items.gunpowder }); addRecipeAuto(new ItemStack(ModItems.rbmk_lid, 4), new Object[] { "PPP", "CCC", "PPP", 'P', STEEL.plate(), 'C', ModBlocks.concrete_asbestos }); addRecipeAuto(new ItemStack(ModItems.rbmk_lid_glass, 4), new Object[] { "LLL", "BBB", "P P", 'P', STEEL.plate(), 'L', ModBlocks.glass_lead, 'B', ModBlocks.glass_boron }); @@ -854,13 +854,17 @@ public class CraftingManager { addRecipeAuto(new ItemStack(Items.name_tag), new Object[] { "SB ", "BPB", " BP", 'S', Items.string, 'B', ANY_TAR.any(), 'P', Items.paper }); addRecipeAuto(new ItemStack(ModItems.rag, 4), new Object[] { "SW", "WS", 'S', Items.string, 'W', Blocks.wool }); + addShapelessAuto(new ItemStack(ModItems.solid_fuel, 10), new Object[] { ModItems.canister_heatingoil, KEY_TOOL_CHEMISTRYSET }); + addShapelessAuto(new ItemStack(ModItems.solid_fuel, 10), new Object[] { new ItemStack(ModItems.fluid_tank_full, 1, Fluids.HEATINGOIL.getID()), KEY_TOOL_CHEMISTRYSET }); + addShapelessAuto(new ItemStack(ModItems.solid_fuel, 10), new Object[] { new ItemStack(ModItems.fluid_tank_lead_full, 1, Fluids.HEATINGOIL.getID()), KEY_TOOL_CHEMISTRYSET }); + addRecipeAuto(new ItemStack(ModBlocks.machine_condenser), new Object[] { "SIS", "ICI", "SIS", 'S', STEEL.ingot(), 'I', IRON.plate(), 'C', ModItems.board_copper }); addShapelessAuto(new ItemStack(ModItems.book_guide, 1, BookType.TEST.ordinal()), new Object[] { Items.book, ModItems.canned_jizz }); addShapelessAuto(new ItemStack(ModItems.book_guide, 1, BookType.RBMK.ordinal()), new Object[] { Items.book, Items.potato }); addShapelessAuto(new ItemStack(ModItems.book_guide, 1, BookType.HADRON.ordinal()), new Object[] { Items.book, ModItems.fuse }); - addShapelessAuto(new ItemStack(ModItems.holotape_image, 1, EnumHoloImage.HOLO_RESTORED.ordinal()), new Object[] { new ItemStack(ModItems.holotape_image, 1, EnumHoloImage.HOLO_DIGAMMA.ordinal()), ModItems.screwdriver, ModItems.ducttape, ModItems.armor_polish }); + addShapelessAuto(new ItemStack(ModItems.holotape_image, 1, EnumHoloImage.HOLO_RESTORED.ordinal()), new Object[] { new ItemStack(ModItems.holotape_image, 1, EnumHoloImage.HOLO_DIGAMMA.ordinal()), KEY_TOOL_SCREWDRIVER, ModItems.ducttape, ModItems.armor_polish }); if(GeneralConfig.enableBabyMode) { addShapelessAuto(new ItemStack(ModItems.cordite, 3), new Object[] { ModItems.ballistite, Items.gunpowder, new ItemStack(Blocks.wool, 1, OreDictionary.WILDCARD_VALUE) }); diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index bbb4b5c9e..e4938dd03 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -766,6 +766,7 @@ item.balefire_and_ham.name=Ham and Balefire-Eggs item.balefire_and_steel.name=Balefire-Zeug item.balefire_scrambled.name=Rühr-Balefire-Ei item.ball_dynamite.name=Dynamit +item.ball_tnt.name=TNT item.ballistite.name=Ballistit item.bandaid.name=Samtenes Pflaster item.bathwater.name=Toxisches Seifenwasser @@ -1021,6 +1022,8 @@ item.centrifuge_element.name=Zentrifugenelement item.centrifuge_tower.name=Zentrifugenturm item.chainsaw.name=Kettensäge item.cheese.name=Käse +item.chemistry_set.name=Laborgläser +item.chemistry_set_boron.name=Laborgläser (Borglas) item.chemistry_template.name=Chemievorlage: item.chernobylsign.name=Tschernobyl-Warnschild-Streitaxt item.chlorine_pinwheel.name=Chlorgas-Konverter @@ -1523,6 +1526,7 @@ item.gun_xvl1456.name=XVL1456 Tau-Kanone Prototyp item.gun_xvl1456_ammo.name=Kiste mit erschöpftem Uran-235 item.gun_zomg.name=ZOMG Kanone item.hand_drill.name=Handbohrer +item.hand_drill_desh.name=Desh-Handbohrer item.hazmat_boots.name=Strahlenschutzstiefel item.hazmat_boots_grey.name=Hochleistungs-Strahlenschutzstiefel item.hazmat_boots_red.name=Verbesserte Strahlenschutzstiefel @@ -1685,6 +1689,8 @@ item.key.name=Schlüssel item.key_fake.name=Gefälschter Schlüssel item.key_kit.name=Schlüssel-Imitationskit item.key_red.name=Roter Schlüssel +item.kit_toolbox.name=Werkzeugkasten +item.kit_toolbox_empty.name=Leerer Werkzeugkasten item.laser_crystal_bismuth.desc=Bismuth-Samarium-Uran-Thorium-Kristallmatrix item.laser_crystal_bismuth.name=BiSmUTh-Laserkristall item.laser_crystal_cmb.desc=Antischrabidium in einem CMB-Schrabidat Legierungsgitter @@ -2138,6 +2144,7 @@ item.powder_astatine.name=Astatstaub item.powder_at209.name=Astat-209-Staub item.powder_au198.name=Gold-198-Staub item.powder_australium.name=Australiumstaub +item.powder_bakelite.name=Bakelitstaub item.powder_balefire.name=Thermonukleare Asche item.powder_beryllium.name=Berylliumstaub item.powder_borax.name=Borax @@ -2464,6 +2471,7 @@ item.rune_hagalaz.name=Rough Catalyst Matrix item.rune_isa.name=Cool Catalyst Matrix item.rune_jera.name=Multiplicative Catalyst Matrix item.rune_thurisaz.name=Additive Catalyst Matrix +item.safety_fuse.name=Zündschnur item.sat_base.name=Satellitenkörper item.sat_chip.name=Satelliten-ID-Chip item.sat_coord.name=Satelliten-Zielmarkierer @@ -2498,6 +2506,7 @@ item.scrap.name=Schrott item.scrap_nuclear.name=Radioaktiver Schutt item.scrap_plastic.name=Geschreddertes Plastik item.screwdriver.name=Schraubenzieher +item.screwdriver_desh.name=Desh-Schraubenzieher item.scrumpy.name=Flasche Scrumpy item.security_boots.name=Sicherheitsstiefel item.security_helmet.name=Sicherheitshelm @@ -3521,6 +3530,7 @@ tile.therm_exo.name=Exothermische Bombe tile.tile_lab.name=Laborfliesen tile.tile_lab_broken.name=Gebrochene Labotfliesen tile.tile_lab_cracked.name=Gesprungene Laborfliesen +tile.tnt_ntm.name=Echtes TNT tile.toxic_block.name=Stereotypischer grüner Schleim tile.turret_cheapo.name=Billigsdorfer Gatling-Geschütz tile.turret_chekhov.name=Schweres MG-Geschütz "Tschechows Gewehr" diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 69674971f..e905e6a8d 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -923,6 +923,7 @@ item.balefire_and_ham.name=Ham and Balefire Eggs item.balefire_and_steel.name=Balefire and Steel item.balefire_scrambled.name=Scrambled Balefire Egg item.ball_dynamite.name=Dynamite +item.ball_tnt.name=TNT item.ballistite.name=Ballistite item.bandaid.name=Velvet Band-Aid item.bathwater.name=Toxic Soapy Water @@ -1189,6 +1190,8 @@ item.centrifuge_element.name=Centrifuge Element item.centrifuge_tower.name=Centrifuge Tower item.chainsaw.name=Chainsaw item.cheese.name=Cheese +item.chemistry_set.name=Laboratory Glassware +item.chemistry_set_boron.name=Laboratory Glassware (Boron Glass) item.chemistry_template.name=Chemistry Template: item.chernobylsign.name=Chernobyl Warning Sign Battle Axe item.chlorine_pinwheel.name=Chlorine Pinwheel @@ -1709,6 +1712,7 @@ item.gun_xvl1456.name=XVL1456 Tau Cannon Prototype item.gun_xvl1456_ammo.name=Depleted Uranium-235 Box item.gun_zomg.name=ZOMG Cannon item.hand_drill.name=Hand Drill +item.hand_drill_desh.name=Desh Hand Drill item.hazmat_boots.name=Hazmat Boots item.hazmat_boots_grey.name=High-Performance Hazmat Boots item.hazmat_boots_red.name=Advanced Hazmat Boots @@ -1888,6 +1892,8 @@ item.key_kit.name=Key Imitation Kit item.key_red.name=Red Key item.key_red.desc=Explore the other side. item.key_red.desc.P11=§4e§r +item.kit_toolbox.name=Toolbox +item.kit_toolbox_empty.name=Empty Toolbox item.laser_crystal_bismuth.desc=Bismuth-Samarium-Uranium-Thorium crystal matrix item.laser_crystal_bismuth.name=BiSmUTh Laser Crystal item.laser_crystal_cmb.desc=Antischrabidium Suspended in a CMB-Schrabidate Alloy Lattice @@ -2392,6 +2398,7 @@ item.powder_astatine.name=Astatine Powder item.powder_at209.name=Astatine-209 Powder item.powder_au198.name=Gold-198 Powder item.powder_australium.name=Australium Powder +item.powder_bakelite.name=Bakelite Powder item.powder_balefire.name=Thermonuclear Ashes item.powder_beryllium.name=Beryllium Powder item.powder_borax.name=Borax @@ -2778,6 +2785,7 @@ item.rune_hagalaz.name=Rough Catalyst Matrix item.rune_isa.name=Cool Catalyst Matrix item.rune_jera.name=Multiplicative Catalyst Matrix item.rune_thurisaz.name=Additive Catalyst Matrix +item.safety_fuse.name=Safety Fuse item.sat_base.name=Satellite Base item.sat_chip.name=Satellite ID-Chip item.sat_coord.name=Satellite Designator @@ -2813,6 +2821,7 @@ item.scrap_nuclear.name=Radioactive Scraps item.scrap_plastic.name=Plastic Scraps item.screwdriver.name=Screwdriver item.screwdriver.desc=Could be used instead of a fuse... +item.screwdriver_desh.name=Desh Screwdriver item.scrumpy.name=Bottle of Scrumpy item.security_boots.name=Security Boots item.security_helmet.name=Security Helmet @@ -3848,6 +3857,7 @@ tile.therm_exo.name=Exothermic Bomb tile.tile_lab.name=Laboratory Tiles tile.tile_lab_broken.name=Broken Laboratory Tiles tile.tile_lab_cracked.name=Cracked Laboratory Tiles +tile.tnt_ntm.name=Actual TNT tile.toxic_block.name=Stereotypical Green Ooze tile.turret_cheapo.name=Cheapo Gatling Sentry tile.turret_chekhov.name=Heavy Machine Gun Turret "Chekhov's Gun" diff --git a/src/main/resources/assets/hbm/textures/blocks/dynamite_top.png b/src/main/resources/assets/hbm/textures/blocks/dynamite_top.png index dd7ee6a25..3d4fe7f40 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/dynamite_top.png and b/src/main/resources/assets/hbm/textures/blocks/dynamite_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/tnt_bottom.png b/src/main/resources/assets/hbm/textures/blocks/tnt_bottom.png new file mode 100644 index 000000000..960e421ee Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/tnt_bottom.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/tnt_side.png b/src/main/resources/assets/hbm/textures/blocks/tnt_side.png new file mode 100644 index 000000000..1673e3459 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/tnt_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/tnt_top.png b/src/main/resources/assets/hbm/textures/blocks/tnt_top.png new file mode 100644 index 000000000..f162242a9 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/tnt_top.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/aromatics.png b/src/main/resources/assets/hbm/textures/gui/fluids/aromatics.png index 432bf3dea..1a69ec3c4 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/aromatics.png and b/src/main/resources/assets/hbm/textures/gui/fluids/aromatics.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/biofuel.png b/src/main/resources/assets/hbm/textures/gui/fluids/biofuel.png index 687c2a190..294a5f639 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/biofuel.png and b/src/main/resources/assets/hbm/textures/gui/fluids/biofuel.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/biogas.png b/src/main/resources/assets/hbm/textures/gui/fluids/biogas.png index 387f7c44c..148996fe2 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/biogas.png and b/src/main/resources/assets/hbm/textures/gui/fluids/biogas.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/carbondioxide.png b/src/main/resources/assets/hbm/textures/gui/fluids/carbondioxide.png index 16e710316..9db8ec7bc 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/carbondioxide.png and b/src/main/resources/assets/hbm/textures/gui/fluids/carbondioxide.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/coolant.png b/src/main/resources/assets/hbm/textures/gui/fluids/coolant.png index 058e8c6d5..1e2aea6af 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/coolant.png and b/src/main/resources/assets/hbm/textures/gui/fluids/coolant.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/deuterium.png b/src/main/resources/assets/hbm/textures/gui/fluids/deuterium.png index d2d4c3587..8640659be 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/deuterium.png and b/src/main/resources/assets/hbm/textures/gui/fluids/deuterium.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/diesel.png b/src/main/resources/assets/hbm/textures/gui/fluids/diesel.png new file mode 100644 index 000000000..ebd7d470d Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/diesel.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/diesel_crack.png b/src/main/resources/assets/hbm/textures/gui/fluids/diesel_crack.png new file mode 100644 index 000000000..40bbe5e3b Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/diesel_crack.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/ethanol.png b/src/main/resources/assets/hbm/textures/gui/fluids/ethanol.png index 8ce2d28fa..672e1b797 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/ethanol.png and b/src/main/resources/assets/hbm/textures/gui/fluids/ethanol.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/fracksol.png b/src/main/resources/assets/hbm/textures/gui/fluids/fracksol.png index 26eff807a..2fc62c152 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/fracksol.png and b/src/main/resources/assets/hbm/textures/gui/fluids/fracksol.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/gas.png b/src/main/resources/assets/hbm/textures/gui/fluids/gas.png index 8fd49f3be..6d012fd6f 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/gas.png and b/src/main/resources/assets/hbm/textures/gui/fluids/gas.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/gasoline.png b/src/main/resources/assets/hbm/textures/gui/fluids/gasoline.png index 3483df5de..8a7b8a4fd 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/gasoline.png and b/src/main/resources/assets/hbm/textures/gui/fluids/gasoline.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/heavywater.png b/src/main/resources/assets/hbm/textures/gui/fluids/heavywater.png index 2941c349a..03882ed06 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/heavywater.png and b/src/main/resources/assets/hbm/textures/gui/fluids/heavywater.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/helium3.png b/src/main/resources/assets/hbm/textures/gui/fluids/helium3.png index 81e73ec09..feebd9cea 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/helium3.png and b/src/main/resources/assets/hbm/textures/gui/fluids/helium3.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/hotsteam.png b/src/main/resources/assets/hbm/textures/gui/fluids/hotsteam.png index a4fc917b6..f1f395a0c 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/hotsteam.png and b/src/main/resources/assets/hbm/textures/gui/fluids/hotsteam.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/hydrogen.png b/src/main/resources/assets/hbm/textures/gui/fluids/hydrogen.png index f18fc4b28..cf9287903 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/hydrogen.png and b/src/main/resources/assets/hbm/textures/gui/fluids/hydrogen.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/kerosene.png b/src/main/resources/assets/hbm/textures/gui/fluids/kerosene.png index 0e8b850f1..c10291c53 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/kerosene.png and b/src/main/resources/assets/hbm/textures/gui/fluids/kerosene.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/lightoil.png b/src/main/resources/assets/hbm/textures/gui/fluids/lightoil.png index 4ce9dfacc..629ce86a4 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/lightoil.png and b/src/main/resources/assets/hbm/textures/gui/fluids/lightoil.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/lightoil_crack.png b/src/main/resources/assets/hbm/textures/gui/fluids/lightoil_crack.png index e5c16933a..0d37547ea 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/lightoil_crack.png and b/src/main/resources/assets/hbm/textures/gui/fluids/lightoil_crack.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/lpg.png b/src/main/resources/assets/hbm/textures/gui/fluids/lpg.png index 398cec75e..780eeb8b0 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/lpg.png and b/src/main/resources/assets/hbm/textures/gui/fluids/lpg.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/nitan.png b/src/main/resources/assets/hbm/textures/gui/fluids/nitan.png index 21e15cfae..5aa0df845 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/nitan.png and b/src/main/resources/assets/hbm/textures/gui/fluids/nitan.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/oxygen.png b/src/main/resources/assets/hbm/textures/gui/fluids/oxygen.png index a99366292..08c0d3875 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/oxygen.png and b/src/main/resources/assets/hbm/textures/gui/fluids/oxygen.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/petroil.png b/src/main/resources/assets/hbm/textures/gui/fluids/petroil.png index 936271aba..257cb3d2f 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/petroil.png and b/src/main/resources/assets/hbm/textures/gui/fluids/petroil.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/petroleum.png b/src/main/resources/assets/hbm/textures/gui/fluids/petroleum.png index 21adc1b38..36b89da19 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/petroleum.png and b/src/main/resources/assets/hbm/textures/gui/fluids/petroleum.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/reclaimed.png b/src/main/resources/assets/hbm/textures/gui/fluids/reclaimed.png index 299d117d6..e61820816 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/reclaimed.png and b/src/main/resources/assets/hbm/textures/gui/fluids/reclaimed.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/spentsteam.png b/src/main/resources/assets/hbm/textures/gui/fluids/spentsteam.png index bb8efddf0..508188727 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/spentsteam.png and b/src/main/resources/assets/hbm/textures/gui/fluids/spentsteam.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/steam.png b/src/main/resources/assets/hbm/textures/gui/fluids/steam.png index 55938868c..bb1c3d747 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/steam.png and b/src/main/resources/assets/hbm/textures/gui/fluids/steam.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/superhotsteam.png b/src/main/resources/assets/hbm/textures/gui/fluids/superhotsteam.png index 6d651b347..b540aafd8 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/superhotsteam.png and b/src/main/resources/assets/hbm/textures/gui/fluids/superhotsteam.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/tritium.png b/src/main/resources/assets/hbm/textures/gui/fluids/tritium.png index 101762059..f1765a02f 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/tritium.png and b/src/main/resources/assets/hbm/textures/gui/fluids/tritium.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/ultrahotsteam.png b/src/main/resources/assets/hbm/textures/gui/fluids/ultrahotsteam.png index 9df61baa4..0c688db61 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/ultrahotsteam.png and b/src/main/resources/assets/hbm/textures/gui/fluids/ultrahotsteam.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/unsaturateds.png b/src/main/resources/assets/hbm/textures/gui/fluids/unsaturateds.png index 4d4dfced6..c40dc81f2 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/unsaturateds.png and b/src/main/resources/assets/hbm/textures/gui/fluids/unsaturateds.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/water_base.png b/src/main/resources/assets/hbm/textures/gui/fluids/water_base.png new file mode 100644 index 000000000..119c8c3b3 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/water_base.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/water_opaque_base.png b/src/main/resources/assets/hbm/textures/gui/fluids/water_opaque_base.png new file mode 100644 index 000000000..83bfaa0ba Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/water_opaque_base.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/xenon.png b/src/main/resources/assets/hbm/textures/gui/fluids/xenon.png index 12fcf0a5a..97ec52a56 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids/xenon.png and b/src/main/resources/assets/hbm/textures/gui/fluids/xenon.png differ diff --git a/src/main/resources/assets/hbm/textures/items/safety_fuse.png b/src/main/resources/assets/hbm/textures/items/safety_fuse.png index 45842eca9..4d15d94d8 100644 Binary files a/src/main/resources/assets/hbm/textures/items/safety_fuse.png and b/src/main/resources/assets/hbm/textures/items/safety_fuse.png differ