From 590fe5d0095fe6fbabbb625d8b4217177c6979a2 Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Thu, 14 May 2020 16:19:50 +0200 Subject: Fixed similar issue for my Jars. Also properly fixed their names, AND the void jars are placeable now! --- src/main/java/common/blocks/Block_IchorJar.java | 3 ++- .../common/blocks/Block_ThaumiumReinforcedJar.java | 3 ++- src/main/java/common/itemBlocks/IB_IchorJar.java | 26 ++++++++++++++++++++++ .../itemBlocks/IB_ThaumiumReinforcedJar.java | 25 +++++++++++++++++++++ src/main/resources/assets/kekztech/lang/en_US.lang | 10 ++++----- 5 files changed, 59 insertions(+), 8 deletions(-) create mode 100644 src/main/java/common/itemBlocks/IB_IchorJar.java create mode 100644 src/main/java/common/itemBlocks/IB_ThaumiumReinforcedJar.java diff --git a/src/main/java/common/blocks/Block_IchorJar.java b/src/main/java/common/blocks/Block_IchorJar.java index a2be000b7a..07696451b9 100644 --- a/src/main/java/common/blocks/Block_IchorJar.java +++ b/src/main/java/common/blocks/Block_IchorJar.java @@ -1,5 +1,6 @@ package common.blocks; +import common.itemBlocks.IB_IchorJar; import common.tileentities.TE_IchorJar; import common.tileentities.TE_IchorVoidJar; import cpw.mods.fml.common.registry.GameRegistry; @@ -35,7 +36,7 @@ public class Block_IchorJar extends BlockJar { public static Block registerBlock() { final String blockName = "kekztech_ichorjar_block"; INSTANCE.setBlockName(blockName); - GameRegistry.registerBlock(INSTANCE, blockName); + GameRegistry.registerBlock(INSTANCE, IB_IchorJar.class, blockName); return INSTANCE; } diff --git a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java index eeb209307e..873d24a465 100644 --- a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java +++ b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import common.itemBlocks.IB_ThaumiumReinforcedJar; import common.tileentities.TE_ThaumiumReinforcedJar; import common.tileentities.TE_ThaumiumReinforcedVoidJar; import cpw.mods.fml.common.registry.GameRegistry; @@ -41,7 +42,7 @@ public class Block_ThaumiumReinforcedJar extends BlockJar { public static Block registerBlock() { final String blockName = "kekztech_thaumiumreinforcedjar_block"; instance.setBlockName(blockName); - GameRegistry.registerBlock(instance, blockName); + GameRegistry.registerBlock(instance, IB_ThaumiumReinforcedJar.class, blockName); return instance; } diff --git a/src/main/java/common/itemBlocks/IB_IchorJar.java b/src/main/java/common/itemBlocks/IB_IchorJar.java new file mode 100644 index 0000000000..11d63c4432 --- /dev/null +++ b/src/main/java/common/itemBlocks/IB_IchorJar.java @@ -0,0 +1,26 @@ +package common.itemBlocks; + + import net.minecraft.block.Block; + import net.minecraft.item.ItemBlock; + import net.minecraft.item.ItemStack; + +public class IB_IchorJar extends ItemBlock { + + public IB_IchorJar(Block block) { super(block); } + + @Override + public int getMetadata(int meta) { + return meta; + } + + @Override + public boolean getHasSubtypes() { + return true; + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return super.getUnlocalizedName() + "." + stack.getItemDamage(); + } +} + diff --git a/src/main/java/common/itemBlocks/IB_ThaumiumReinforcedJar.java b/src/main/java/common/itemBlocks/IB_ThaumiumReinforcedJar.java new file mode 100644 index 0000000000..30b44f962c --- /dev/null +++ b/src/main/java/common/itemBlocks/IB_ThaumiumReinforcedJar.java @@ -0,0 +1,25 @@ +package common.itemBlocks; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +public class IB_ThaumiumReinforcedJar extends ItemBlock { + + public IB_ThaumiumReinforcedJar(Block block) { super(block); } + + @Override + public int getMetadata(int meta) { + return meta; + } + + @Override + public boolean getHasSubtypes() { + return true; + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return super.getUnlocalizedName() + "." + stack.getItemDamage(); + } +} diff --git a/src/main/resources/assets/kekztech/lang/en_US.lang b/src/main/resources/assets/kekztech/lang/en_US.lang index c2ed9c3825..e9dc5ed829 100644 --- a/src/main/resources/assets/kekztech/lang/en_US.lang +++ b/src/main/resources/assets/kekztech/lang/en_US.lang @@ -156,9 +156,8 @@ tile.kekztech_lapotronicenergyunit_block.6.name=Really Ultimate Capacitor (UEV) tile.kekztech_lapotronicenergyunit_block.desc=Part of the Lapotronic Super Capacitor # -------- Thaumium Reinforced Jar: Block -tile.kekztech_thaumiumreinforcedjar_block.name=Thaumium Reinforced Jar -# Disabled because of unknown bug -# tile.kekztech_thaumiumreinforcedjar_block.3.name=Thaumium Reinforced Void Jar +tile.kekztech_thaumiumreinforcedjar_block.0.name=Thaumium Reinforced Jar +tile.kekztech_thaumiumreinforcedjar_block.3.name=Thaumium Reinforced Void Jar # -------- Thaumium Reinforced Jar: Research # This is the name of the research @@ -170,9 +169,8 @@ kekztech.research_page.THAUMIUMREINFORCEDJAR.0=You have heard your fellow Thauma kekztech.research_page.THAUMIUMREINFORCEDJAR.1=Compressing this much Essentia in such a tiny space causes some volatility. Picking up reinforced jars is probably a bad idea...

You imagine that you could get even more out of your jars if only you had some kind of material harder than even diamond or any of the other magical metal you have seen so far. # -------- Ichor Jar: Block -tile.kekztech_ichorjar_block.name=Ichor Jar -# Disabled because of unknown bug -# tile.kekztech_ichorjar_block.3.name=Ichor Void Jar +tile.kekztech_ichorjar_block.0.name=Ichor Jar +tile.kekztech_ichorjar_block.3.name=Ichor Void Jar # -------- Ichor Jar: Research tc.research_name.ICHORJAR=Ichor Jars -- cgit