added item names

Author: JohnButlerThird

src/main/java/net/pufferlab/primal/Primal.java

@@ -69,7 +69,6 @@ public void init(FMLInitializationEvent event) {
         registry.setupWAILA();
         registry.setupHeatables();
         registry.setupConfig();
-        registry.setupCut();
         registry.setupModCompat();
 
         if (debugMode && Utils.isDev()) {

src/main/java/net/pufferlab/primal/Registry.java

@@ -352,6 +352,12 @@ public void setup() {
         register(bricks, "bricks");
         register(smooth, "smooth");
 
+        registerCut(stone);
+        registerCut(cobble);
+        registerCut(small_bricks);
+        registerCut(bricks);
+        registerCut(smooth);
+
         register(stone_slab, "stone_slab", stone_slab, double_stone_slab, false);
         register(double_stone_slab, "double_stone_slab", stone_slab, double_stone_slab, true);
         register(vertical_stone_slab, "vertical_stone_slab", vertical_stone_slab, double_vertical_stone_slab, false);
@@ -599,14 +605,6 @@ public void setupCommands() {
         registerCommand(new CommandVein());
     }
 
-    public void setupCut() {
-        registerCut(stone);
-        registerCut(cobble);
-        registerCut(small_bricks);
-        registerCut(bricks);
-        registerCut(smooth);
-    }
-
     public void setupConfig() {
         ConfigUtils.initConfigMap();
 
@@ -744,13 +742,10 @@ public void registerModItem(Item item, String name) {
                 String[] elements = item2.getElements();
                 String[] elementsBlacklist = item2.getElementsBlacklist();
                 String elementName = item2.getElementName();
-                String suffix = "";
-                if (item2.hasSuffix()) {
-                    suffix = "_" + elementName;
-                }
+                String suffix = item2.getSuffix();
                 for (int i = 0; i < elements.length; i++) {
                     if (!Utils.contains(elementsBlacklist, elements[i])) {
-                        ItemStack stack = new ItemStack(item2.getItemObject(), 1, i);
+                        ItemStack stack = new ItemStack(item, 1, i);
                         ItemUtils.registerModItem(elements[i] + suffix, stack);
                         if (item2.registerOre()) {
                             ItemUtils

src/main/java/net/pufferlab/primal/items/IMetaItem.java

@@ -1,7 +1,5 @@
 package net.pufferlab.primal.items;
 
-import net.minecraft.item.Item;
-
 public interface IMetaItem {
 
     public String[] getElements();
@@ -14,13 +12,19 @@ default String[] getElementsBlacklist() {
 
     public boolean hasSuffix();
 
+    default String getSuffix() {
+        String suffix = "";
+        if (hasSuffix()) {
+            suffix = "_" + getElementName();
+        }
+        return suffix;
+    }
+
     default boolean registerOre() {
         return false;
     }
 
     default boolean registerModItem() {
         return true;
     }
-
-    public Item getItemObject();
 }

src/main/java/net/pufferlab/primal/items/ItemMeta.java

@@ -140,8 +140,4 @@ public boolean registerOre() {
     public String getElementName() {
         return name;
     }
-
-    public Item getItemObject() {
-        return this;
-    }
 }

src/main/java/net/pufferlab/primal/items/ItemMetaFood.java

@@ -143,8 +143,4 @@ public boolean hasSuffix() {
     public String getElementName() {
         return name;
     }
-
-    public Item getItemObject() {
-        return this;
-    }
 }

src/main/java/net/pufferlab/primal/items/itemblocks/ItemBlockAxle.java

@@ -58,9 +58,4 @@ public String getElementName() {
     public boolean hasSuffix() {
         return false;
     }
-
-    @Override
-    public Item getItemObject() {
-        return this;
-    }
 }

src/main/java/net/pufferlab/primal/items/itemblocks/ItemBlockCutSlab.java

@@ -9,10 +9,11 @@
 import net.pufferlab.primal.Primal;
 import net.pufferlab.primal.Utils;
 import net.pufferlab.primal.blocks.BlockCutSlab;
+import net.pufferlab.primal.items.IMetaItem;
 import net.pufferlab.primal.utils.CutUtils;
 import net.pufferlab.primal.utils.FacingUtils;
 
-public class ItemBlockCutSlab extends ItemBlock {
+public class ItemBlockCutSlab extends ItemBlock implements IMetaItem {
 
     private final boolean isFull;
     private final BlockCutSlab slabBlock;
@@ -177,4 +178,22 @@ private boolean func_150946_a(ItemStack stack, EntityPlayer player, World world,
             return false;
         }
     }
+
+    @Override
+    public String[] getElements() {
+        return CutUtils.getModNames();
+    }
+
+    @Override
+    public String getElementName() {
+        if(isFull) {
+            return "double_slab";
+        }
+        return "slab";
+    }
+
+    @Override
+    public boolean hasSuffix() {
+        return true;
+    }
 }

src/main/java/net/pufferlab/primal/items/itemblocks/ItemBlockCutSlabVertical.java

@@ -9,10 +9,11 @@
 import net.pufferlab.primal.Primal;
 import net.pufferlab.primal.Utils;
 import net.pufferlab.primal.blocks.BlockCutSlabVertical;
+import net.pufferlab.primal.items.IMetaItem;
 import net.pufferlab.primal.utils.CutUtils;
 import net.pufferlab.primal.utils.FacingUtils;
 
-public class ItemBlockCutSlabVertical extends ItemBlock {
+public class ItemBlockCutSlabVertical extends ItemBlock implements IMetaItem {
 
     private final boolean isFull;
     private final BlockCutSlabVertical slabBlock;
@@ -184,4 +185,21 @@ public IIcon getIconFromDamage(int id) {
         return CutUtils.getIcon(2, id);
     }
 
+    @Override
+    public String[] getElements() {
+        return CutUtils.getModNames();
+    }
+
+    @Override
+    public String getElementName() {
+        if(isFull) {
+            return "double_vertical_slab";
+        }
+        return "vertical_slab";
+    }
+
+    @Override
+    public boolean hasSuffix() {
+        return true;
+    }
 }

src/main/java/net/pufferlab/primal/items/itemblocks/ItemBlockCutStairs.java

@@ -8,9 +8,10 @@
 import net.minecraft.world.World;
 import net.pufferlab.primal.Primal;
 import net.pufferlab.primal.blocks.BlockCutStairs;
+import net.pufferlab.primal.items.IMetaItem;
 import net.pufferlab.primal.utils.CutUtils;
 
-public class ItemBlockCutStairs extends ItemBlock {
+public class ItemBlockCutStairs extends ItemBlock implements IMetaItem {
 
     public ItemBlockCutStairs(Block block) {
         super(block);
@@ -60,4 +61,18 @@ public IIcon getIconFromDamage(int id) {
         return CutUtils.getIcon(2, id);
     }
 
+    @Override
+    public String[] getElements() {
+        return CutUtils.getModNames();
+    }
+
+    @Override
+    public String getElementName() {
+        return "stairs";
+    }
+
+    @Override
+    public boolean hasSuffix() {
+        return true;
+    }
 }

src/main/java/net/pufferlab/primal/items/itemblocks/ItemBlockMeta.java

@@ -1,7 +1,6 @@
 package net.pufferlab.primal.items.itemblocks;
 
 import net.minecraft.block.Block;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.pufferlab.primal.Primal;
 import net.pufferlab.primal.Utils;
@@ -72,9 +71,4 @@ public boolean hasSuffix() {
     public boolean registerOre() {
         return registerOre;
     }
-
-    @Override
-    public Item getItemObject() {
-        return this;
-    }
 }