diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 5e0b6d7fb..8b04b34a4 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -846,16 +846,7 @@ public class ModBlocks { public static Block ladder_steel; public static Block ladder_tungsten; - public static Block trapdoor_sturdy; - public static Block trapdoor_iron; - public static Block trapdoor_gold; - public static Block trapdoor_aluminium; - public static Block trapdoor_copper; - public static Block trapdoor_titanium; - public static Block trapdoor_lead; - public static Block trapdoor_cobalt; public static Block trapdoor_steel; - public static Block trapdoor_tungsten; public static Block barrel_plastic; public static Block barrel_corroded; @@ -1985,17 +1976,8 @@ public class ModBlocks { ladder_cobalt = new BlockNTMLadder().setBlockName("ladder_cobalt").setHardness(0.25F).setResistance(2.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":ladder_cobalt"); ladder_steel = new BlockNTMLadder().setBlockName("ladder_steel").setHardness(0.25F).setResistance(2.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":ladder_steel"); ladder_tungsten = new BlockNTMLadder().setBlockName("ladder_tungsten").setHardness(0.25F).setResistance(2.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":ladder_tungsten"); - - trapdoor_sturdy = new BlockNTMTrapdoor(Material.wood).setBlockName("trapdoor_sturdy").setHardness(3F).setResistance(8.0F).setStepSound(Block.soundTypeWood).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":trapdoor_sturdy"); - trapdoor_iron = new BlockNTMTrapdoor(Material.iron).setBlockName("trapdoor_iron").setHardness(3F).setResistance(8.0F).setStepSound(Block.soundTypeMetal).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":trapdoor_iron"); - trapdoor_gold = new BlockNTMTrapdoor(Material.iron).setBlockName("trapdoor_gold").setHardness(3F).setResistance(8.0F).setStepSound(Block.soundTypeMetal).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":trapdoor_gold"); - trapdoor_aluminium = new BlockNTMTrapdoor(Material.iron).setBlockName("trapdoor_aluminium").setHardness(3F).setResistance(8.0F).setStepSound(Block.soundTypeMetal).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":trapdoor_aluminium"); - trapdoor_copper = new BlockNTMTrapdoor(Material.iron).setBlockName("trapdoor_copper").setHardness(3F).setResistance(8.0F).setStepSound(Block.soundTypeMetal).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":trapdoor_copper"); - trapdoor_titanium = new BlockNTMTrapdoor(Material.iron).setBlockName("trapdoor_titanium").setHardness(3F).setResistance(8.0F).setStepSound(Block.soundTypeMetal).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":trapdoor_titanium"); - trapdoor_lead = new BlockNTMTrapdoor(Material.iron).setBlockName("trapdoor_lead").setHardness(3F).setResistance(8.0F).setStepSound(Block.soundTypeMetal).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":trapdoor_lead"); - trapdoor_cobalt = new BlockNTMTrapdoor(Material.iron).setBlockName("trapdoor_cobalt").setHardness(3F).setResistance(8.0F).setStepSound(Block.soundTypeMetal).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":trapdoor_cobalt"); + trapdoor_steel = new BlockNTMTrapdoor(Material.iron).setBlockName("trapdoor_steel").setHardness(3F).setResistance(8.0F).setStepSound(Block.soundTypeMetal).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":trapdoor_steel"); - trapdoor_tungsten = new BlockNTMTrapdoor(Material.iron).setBlockName("trapdoor_tungsten").setHardness(3F).setResistance(8.0F).setStepSound(Block.soundTypeMetal).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":trapdoor_tungsten"); barrel_plastic = new BlockFluidBarrel(Material.iron, 12000).setBlockName("barrel_plastic").setStepSound(Block.soundTypeStone).setHardness(2.0F).setResistance(5.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":barrel_plastic"); barrel_corroded = new BlockFluidBarrel(Material.iron, 6000).setBlockName("barrel_corroded").setStepSound(Block.soundTypeMetal).setHardness(2.0F).setResistance(5.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":barrel_corroded"); @@ -3261,16 +3243,7 @@ public class ModBlocks { GameRegistry.registerBlock(ladder_steel, ladder_steel.getUnlocalizedName()); GameRegistry.registerBlock(ladder_lead, ladder_lead.getUnlocalizedName()); GameRegistry.registerBlock(ladder_cobalt, ladder_cobalt.getUnlocalizedName()); - GameRegistry.registerBlock(trapdoor_sturdy, trapdoor_sturdy.getUnlocalizedName()); - GameRegistry.registerBlock(trapdoor_iron, trapdoor_iron.getUnlocalizedName()); - GameRegistry.registerBlock(trapdoor_gold, trapdoor_gold.getUnlocalizedName()); - GameRegistry.registerBlock(trapdoor_titanium, trapdoor_titanium.getUnlocalizedName()); - GameRegistry.registerBlock(trapdoor_copper, trapdoor_copper.getUnlocalizedName()); - GameRegistry.registerBlock(trapdoor_tungsten, trapdoor_tungsten.getUnlocalizedName()); - GameRegistry.registerBlock(trapdoor_aluminium, trapdoor_aluminium.getUnlocalizedName()); GameRegistry.registerBlock(trapdoor_steel, trapdoor_steel.getUnlocalizedName()); - GameRegistry.registerBlock(trapdoor_lead, trapdoor_lead.getUnlocalizedName()); - GameRegistry.registerBlock(trapdoor_cobalt, trapdoor_cobalt.getUnlocalizedName()); register(barrel_plastic); register(barrel_corroded); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 679f8ca96..a64ed3b12 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -883,16 +883,7 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModBlocks.ladder_steel, 8), new Object[] { "LLL", "L#L", "LLL", 'L', Blocks.ladder, '#', STEEL.ingot() }); addRecipeAuto(new ItemStack(ModBlocks.ladder_tungsten, 8), new Object[] { "LLL", "L#L", "LLL", 'L', Blocks.ladder, '#', W.ingot() }); - addShapelessAuto(new ItemStack(ModBlocks.trapdoor_sturdy, 1), new Object[] { Blocks.trapdoor, KEY_PLANKS }); - addShapelessAuto(new ItemStack(ModBlocks.trapdoor_iron, 1), new Object[] { Blocks.trapdoor, IRON.ingot() }); - addShapelessAuto(new ItemStack(ModBlocks.trapdoor_gold, 1), new Object[] { Blocks.trapdoor, GOLD.ingot() }); - addShapelessAuto(new ItemStack(ModBlocks.trapdoor_aluminium, 1), new Object[] { Blocks.trapdoor, AL.ingot() }); - addShapelessAuto(new ItemStack(ModBlocks.trapdoor_copper, 1), new Object[] { Blocks.trapdoor, CU.ingot() }); - addShapelessAuto(new ItemStack(ModBlocks.trapdoor_titanium, 1), new Object[] { Blocks.trapdoor, TI.ingot() }); - addShapelessAuto(new ItemStack(ModBlocks.trapdoor_lead, 1), new Object[] { Blocks.trapdoor, PB.ingot() }); - addShapelessAuto(new ItemStack(ModBlocks.trapdoor_cobalt, 1), new Object[] { Blocks.trapdoor, CO.ingot() }); addShapelessAuto(new ItemStack(ModBlocks.trapdoor_steel, 1), new Object[] { Blocks.trapdoor, STEEL.ingot() }); - addShapelessAuto(new ItemStack(ModBlocks.trapdoor_tungsten, 1), new Object[] { Blocks.trapdoor, W.ingot() }); addRecipeAuto(new ItemStack(ModBlocks.machine_storage_drum), new Object[] { "LLL", "L#L", "LLL", 'L', PB.plate(), '#', ModItems.tank_steel }); diff --git a/src/main/java/com/hbm/world/gen/component/BunkerComponents.java b/src/main/java/com/hbm/world/gen/component/BunkerComponents.java index 033a165f9..d909fc431 100644 --- a/src/main/java/com/hbm/world/gen/component/BunkerComponents.java +++ b/src/main/java/com/hbm/world/gen/component/BunkerComponents.java @@ -127,7 +127,6 @@ public class BunkerComponents { fillWithMetadataBlocks(world, box, 1, hpos, 4, 1, hpos, 6, ModBlocks.concrete_smooth_stairs, getStairMeta(0)); placeBlockAtCurrentPosition(world, ModBlocks.concrete_slab, 1, 2, hpos, 3, box); placeBlockAtCurrentPosition(world, ModBlocks.concrete_smooth_stairs, getStairMeta(2), 2, hpos, 4, box); - placeBlockAtCurrentPosition(world, ModBlocks.trapdoor_sturdy, getDecoModelMeta(8) >> 2, 2, hpos, 5, box); placeBlockAtCurrentPosition(world, ModBlocks.concrete_smooth_stairs, getStairMeta(3), 2, hpos, 6, box); placeBlockAtCurrentPosition(world, ModBlocks.concrete_slab, 1, 2, hpos, 7, box); fillWithMetadataBlocks(world, box, 3, hpos, 4, 3, hpos, 6, ModBlocks.concrete_smooth_stairs, getStairMeta(1)); diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 61488367a..37cac623a 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -4320,16 +4320,7 @@ tile.ladder_steel.name=Stahlleiter tile.ladder_sturdy.name=Feste Holzleiter tile.ladder_titanium.name=Titanleiter tile.ladder_tungsten.name=Wolframleiter -tile.trapdoor_aluminium.name=Aluminium-Falltür -tile.trapdoor_cobalt.name=Kobalt-Falltür -tile.trapdoor_copper.name=Kupfer-Falltür -tile.trapdoor_gold.name=Goldene -Falltür -tile.trapdoor_iron.name=Eisen-Falltür -tile.trapdoor_lead.name=Bleilieter tile.trapdoor_steel.name=Stahl-Falltür -tile.trapdoor_sturdy.name=Feste Holz-Falltür -tile.trapdoor_titanium.name=Titan-Falltür -tile.trapdoor_tungsten.name=Wolfram-Falltür tile.lamp_demon.name=Dämonenkernlampe tile.lamp_tritium_blue_off.name=Blaue Tritiumlampe tile.lamp_tritium_blue_on.name=Blaue Tritiumlampe diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 8d324c9f1..6ab027529 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -5445,16 +5445,7 @@ tile.ladder_steel.name=Steel Ladder tile.ladder_sturdy.name=Sturdy Wooden Ladder tile.ladder_titanium.name=Titanium Ladder tile.ladder_tungsten.name=Tungsten Ladder -tile.trapdoor_aluminium.name=Aluminium Trapdoor -tile.trapdoor_cobalt.name=Cobalt Trapdoor -tile.trapdoor_copper.name=Copper Trapdoor -tile.trapdoor_gold.name=Golden Trapdoor -tile.trapdoor_iron.name=Iron Trapdoor -tile.trapdoor_lead.name=Lead Trapdoor tile.trapdoor_steel.name=Steel Trapdoor -tile.trapdoor_sturdy.name=Sturdy Wooden Trapdoor -tile.trapdoor_titanium.name=Titanium Trapdoor -tile.trapdoor_tungsten.name=Tungsten Trapdoor tile.lamp_demon.name=Demon Core Lamp tile.lamp_tritium_blue_off.name=Blue Tritium Lamp tile.lamp_tritium_blue_on.name=Blue Tritium Lamp diff --git a/src/main/resources/assets/hbm/lang/it_IT.lang b/src/main/resources/assets/hbm/lang/it_IT.lang index 1e84bfbdb..b426cae6d 100644 --- a/src/main/resources/assets/hbm/lang/it_IT.lang +++ b/src/main/resources/assets/hbm/lang/it_IT.lang @@ -5513,16 +5513,7 @@ tile.ladder_steel.name=Steel Ladder tile.ladder_sturdy.name=Sturdy Wooden Ladder tile.ladder_titanium.name=Titanium Ladder tile.ladder_tungsten.name=Tungsten Ladder -tile.trapdoor_aluminium.name=Aluminium Trapdoor -tile.trapdoor_cobalt.name=Cobalt Trapdoor -tile.trapdoor_copper.name=Copper Trapdoor -tile.trapdoor_gold.name=Golden Trapdoor -tile.trapdoor_iron.name=Iron Trapdoor -tile.trapdoor_lead.name=Lead Trapdoor tile.trapdoor_steel.name=Steel Trapdoor -tile.trapdoor_sturdy.name=Sturdy Wooden Trapdoor -tile.trapdoor_titanium.name=Titanium Trapdoor -tile.trapdoor_tungsten.name=Tungsten Trapdoor tile.lamp_demon.name=Demon Core Lamp tile.lamp_tritium_blue_off.name=Blue Tritium Lamp tile.lamp_tritium_blue_on.name=Blue Tritium Lamp diff --git a/src/main/resources/assets/hbm/lang/pl_PL.lang b/src/main/resources/assets/hbm/lang/pl_PL.lang index 2509f8ecc..9ff1a89d8 100644 --- a/src/main/resources/assets/hbm/lang/pl_PL.lang +++ b/src/main/resources/assets/hbm/lang/pl_PL.lang @@ -4859,16 +4859,7 @@ tile.ladder_steel.name=Steel Ladder tile.ladder_sturdy.name=Sturdy Wooden Ladder tile.ladder_titanium.name=Titanium Ladder tile.ladder_tungsten.name=Tungsten Ladder -tile.trapdoor_aluminium.name=Aluminium Trapdoor -tile.trapdoor_cobalt.name=Cobalt Trapdoor -tile.trapdoor_copper.name=Copper Trapdoor -tile.trapdoor_gold.name=Golden Trapdoor -tile.trapdoor_iron.name=Iron Trapdoor -tile.trapdoor_lead.name=Lead Trapdoor tile.trapdoor_steel.name=Steel Trapdoor -tile.trapdoor_sturdy.name=Sturdy Wooden Trapdoor -tile.trapdoor_titanium.name=Titanium Trapdoor -tile.trapdoor_tungsten.name=Tungsten Trapdoor tile.lamp_demon.name=Demon Core Lamp tile.lamp_tritium_blue_off.name=Blue Tritium Lamp tile.lamp_tritium_blue_on.name=Blue Tritium Lamp diff --git a/src/main/resources/assets/hbm/lang/ru_RU.lang b/src/main/resources/assets/hbm/lang/ru_RU.lang index 7ac18c33a..43df8e497 100644 --- a/src/main/resources/assets/hbm/lang/ru_RU.lang +++ b/src/main/resources/assets/hbm/lang/ru_RU.lang @@ -5689,16 +5689,7 @@ tile.ladder_steel.name=Стальная лестница tile.ladder_sturdy.name=Прочная деревянная лестница tile.ladder_titanium.name=Титановая лестница tile.ladder_tungsten.name=Вольфрамовая лестница -tile.trapdoor_aluminium.name=Алюминиевый люк -tile.trapdoor_cobalt.name=Кобальтовый люк -tile.trapdoor_copper.name=Медный люк -tile.trapdoor_gold.name=Золотый люк -tile.trapdoor_iron.name=Железный люк -tile.trapdoor_lead.name=Свинцовый люк tile.trapdoor_steel.name=Стальный люк -tile.trapdoor_sturdy.name=Прочный деревянный люк -tile.trapdoor_titanium.name=Титановый люк -tile.trapdoor_tungsten.name=Вольфрамовый люк tile.lamp_demon.name=Лампа из заряда-демона tile.lamp_tritium_blue_off.name=Синяя тритиевая лампа tile.lamp_tritium_blue_on.name=Синяя тритиевая лампа diff --git a/src/main/resources/assets/hbm/lang/uk_UA.lang b/src/main/resources/assets/hbm/lang/uk_UA.lang index 1e304f224..8d019103e 100644 --- a/src/main/resources/assets/hbm/lang/uk_UA.lang +++ b/src/main/resources/assets/hbm/lang/uk_UA.lang @@ -5445,16 +5445,7 @@ tile.ladder_steel.name=Сталева драбина tile.ladder_sturdy.name=Міцна дерев'яна драбина tile.ladder_titanium.name=Титанова драбина tile.ladder_tungsten.name=Вольфрамова драбина -tile.trapdoor_aluminium.name=Алюмінієвий люк -tile.trapdoor_cobalt.name=Кобальтовий люк -tile.trapdoor_copper.name=Мідний люк -tile.trapdoor_gold.name=Золотий люк -tile.trapdoor_iron.name=Залізний люк -tile.trapdoor_lead.name=Свинцевий люк tile.trapdoor_steel.name=Сталевий люк -tile.trapdoor_sturdy.name=Міцний дерев'яний люк -tile.trapdoor_titanium.name=Титановий люк -tile.trapdoor_tungsten.name=Вольфрамовий люк tile.lamp_demon.name=Ядро-демон лампа tile.lamp_tritium_blue_off.name=Синя тритієва лампа tile.lamp_tritium_blue_on.name=Синя тритієва лампа diff --git a/src/main/resources/assets/hbm/lang/zh_CN.lang b/src/main/resources/assets/hbm/lang/zh_CN.lang index a355a4bdb..9f5d39f26 100644 --- a/src/main/resources/assets/hbm/lang/zh_CN.lang +++ b/src/main/resources/assets/hbm/lang/zh_CN.lang @@ -5155,16 +5155,7 @@ tile.ladder_steel.name=钢制梯子 tile.ladder_sturdy.name=坚固木头制梯子 tile.ladder_titanium.name=钛制梯子 tile.ladder_tungsten.name=钨制梯子 -tile.trapdoor_aluminium.name=铝制活板门 -tile.trapdoor_cobalt.name=钴制活板门 -tile.trapdoor_copper.name=铜制活板门 -tile.trapdoor_gold.name=金制活板门 -tile.trapdoor_iron.name=铁制活板门 -tile.trapdoor_lead.name=铅制活板门 tile.trapdoor_steel.name=钢制活板门 -tile.trapdoor_sturdy.name=硬木活板门 -tile.trapdoor_titanium.name=钛制活板门 -tile.trapdoor_tungsten.name=钨制活板门 tile.lamp_demon.name=恶魔核心灯 tile.lamp_tritium_blue_off.name=蓝色氚灯 tile.lamp_tritium_blue_on.name=蓝色氚灯 diff --git a/src/main/resources/assets/hbm/textures/blocks/trapdoor_aluminium.png b/src/main/resources/assets/hbm/textures/blocks/trapdoor_aluminium.png deleted file mode 100644 index 8b1391059..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/trapdoor_aluminium.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/trapdoor_cobalt.png b/src/main/resources/assets/hbm/textures/blocks/trapdoor_cobalt.png deleted file mode 100644 index 544a3ca12..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/trapdoor_cobalt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/trapdoor_copper.png b/src/main/resources/assets/hbm/textures/blocks/trapdoor_copper.png deleted file mode 100644 index e91bd7744..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/trapdoor_copper.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/trapdoor_gold.png b/src/main/resources/assets/hbm/textures/blocks/trapdoor_gold.png deleted file mode 100644 index 64fa02445..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/trapdoor_gold.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/trapdoor_iron.png b/src/main/resources/assets/hbm/textures/blocks/trapdoor_iron.png deleted file mode 100644 index 4b0dcaddc..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/trapdoor_iron.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/trapdoor_lead.png b/src/main/resources/assets/hbm/textures/blocks/trapdoor_lead.png deleted file mode 100644 index 4a0f6b48e..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/trapdoor_lead.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/trapdoor_sturdy.png b/src/main/resources/assets/hbm/textures/blocks/trapdoor_sturdy.png deleted file mode 100644 index bac7d08ef..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/trapdoor_sturdy.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/trapdoor_titanium.png b/src/main/resources/assets/hbm/textures/blocks/trapdoor_titanium.png deleted file mode 100644 index e40244736..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/trapdoor_titanium.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/trapdoor_tungsten.png b/src/main/resources/assets/hbm/textures/blocks/trapdoor_tungsten.png deleted file mode 100644 index c85bdc129..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/trapdoor_tungsten.png and /dev/null differ