aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorkekzdealer <kekzdealer@gmail.com>2020-05-14 16:19:50 +0200
committerkekzdealer <kekzdealer@gmail.com>2020-05-14 16:19:50 +0200
commit590fe5d0095fe6fbabbb625d8b4217177c6979a2 (patch)
tree2dfc7af25e933b63690bcaf5fe86e0d8f826fb6b /src/main/java
parent88ff36b7740c98562784ffff6e56fe122b090bcc (diff)
downloadGT5-Unofficial-590fe5d0095fe6fbabbb625d8b4217177c6979a2.tar.gz
GT5-Unofficial-590fe5d0095fe6fbabbb625d8b4217177c6979a2.tar.bz2
GT5-Unofficial-590fe5d0095fe6fbabbb625d8b4217177c6979a2.zip
Fixed similar issue for my Jars. Also properly fixed their names, AND the void jars are placeable now!
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/common/blocks/Block_IchorJar.java3
-rw-r--r--src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java3
-rw-r--r--src/main/java/common/itemBlocks/IB_IchorJar.java26
-rw-r--r--src/main/java/common/itemBlocks/IB_ThaumiumReinforcedJar.java25
4 files changed, 55 insertions, 2 deletions
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();
+ }
+}