Fixed some thing, added things to add blockitem

Author: tbvns

src/main/java/xyz/prismenetwork/kelpmodloader/Item/GenerateBlockItems.java

@@ -0,0 +1,21 @@
+package xyz.prismenetwork.kelpmodloader.Item;
+
+import org.bukkit.Material;
+import xyz.prismenetwork.kelpmodloader.Block.ModdedBlock;
+import xyz.prismenetwork.kelpmodloader.Constant;
+
+import java.util.List;
+
+public class GenerateBlockItems {
+    public static void generate() {
+        List<ModdedBlock> blocks = Constant.Blocks;
+        blocks.forEach(b -> {
+            ModdedItem item = new ModdedItem();
+            item.Name = b.name;
+            item.TextureName = b.TextureName;
+            item.isBlockItem = true;
+            item.setID(b.getId());
+            Constant.Items.add(item);
+        });
+    }
+}

src/main/java/xyz/prismenetwork/kelpmodloader/Item/ItemType.java

@@ -1,10 +1,11 @@
 package xyz.prismenetwork.kelpmodloader.Item;
 
 public class ItemType {
-    public final String Sword = "sword";
-    public final String Shovel = "shovel";
-    public final String Pickaxe = "pickaxe";
-    public final String Hoe = "hoe";
-    public final String Shears = "shears";
-    public final String Default = "default";
+    public static final String Sword = "sword";
+    public static final String Shovel = "shovel";
+    public static final String Pickaxe = "pickaxe";
+    public static final String Hoe = "hoe";
+    public static final String Shears = "shears";
+    public static final String Default = "default";
+    public static final String Block = "block";
 }

src/main/java/xyz/prismenetwork/kelpmodloader/Item/ModdedItem.java

@@ -10,6 +10,7 @@ public class ModdedItem {
     public String Lore = "";
     public String itemType;
     public Material ItemMaterial = Material.STICK;
+    public boolean isBlockItem = false;
     /**
      * Return the id of the item.
      */
@@ -25,4 +26,5 @@ public void setID(int nID) {
         id = nID;
     }
 
+
 }

src/main/java/xyz/prismenetwork/kelpmodloader/KelpModLoader.java

@@ -5,6 +5,7 @@
 import xyz.prismenetwork.kelpmodloader.Block.CreateBlock;
 import xyz.prismenetwork.kelpmodloader.EventHandler.BlockPlaceEvent;
 import xyz.prismenetwork.kelpmodloader.EventHandler.BlockUpdateEvent;
+import xyz.prismenetwork.kelpmodloader.Item.GenerateBlockItems;
 import xyz.prismenetwork.kelpmodloader.Mods.ModsLoader;
 import xyz.prismenetwork.kelpmodloader.Pack.CreatePack;
 
@@ -20,24 +21,34 @@ public void onEnable() {
                 "§2Status: §aStarting                 \n" +
                 "§2Devloper: §atbvns                  \n" +
                 "§2---------------------------------- ");
-
+        //Register event
         getServer().getPluginManager().registerEvents(new BlockUpdateEvent(), this);
         getServer().getPluginManager().registerEvents(new BlockPlaceEvent(), this);
 
+        //Load mods
         new ModsLoader().load();
 
         getServer().getConsoleSender().sendMessage( "\n" +
                 "§2---------------------------------- \n" +
                 "§2Status: §aStarting                 \n" +
                 "§2Task: §aGenerating texture pack      \n" +
                 "§2---------------------------------- ");
+        //Generate texture pack
         try {
             CreatePack.Create();
         } catch (IOException e) {
             e.printStackTrace();
         }
         new CreateBlock().Create(getServer());
+        getServer().getConsoleSender().sendMessage( "\n" +
+                "§2---------------------------------- \n" +
+                "§2Status: §aStarting                \n" +
+                "§2Task: §aGenerating block items      \n" +
+                "§2---------------------------------- ");
+        //Generate block-items
+        GenerateBlockItems.generate();
 
+        //KML is loaded \o/
         getServer().getConsoleSender().sendMessage( "\n" +
                 "§2---------------------------------- \n" +
                 "§2Status: §aStarted                \n" +

src/main/java/xyz/prismenetwork/kelpmodloader/Item/ItemUtils.java renamed to src/main/java/xyz/prismenetwork/kelpmodloader/ModsAPI/ItemUtils.java

@@ -1,10 +1,11 @@
-package xyz.prismenetwork.kelpmodloader.Item;
+package xyz.prismenetwork.kelpmodloader.ModsAPI;
 
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import xyz.prismenetwork.kelpmodloader.Block.ModdedBlock;
 import xyz.prismenetwork.kelpmodloader.Constant;
+import xyz.prismenetwork.kelpmodloader.Item.ModdedItem;
 
 public class ItemUtils {
     public static boolean isModed(ItemStack itemStack) {
@@ -24,11 +25,22 @@ public static boolean isModed(ItemStack itemStack) {
     public static ModdedItem getModedItem(ItemStack itemStack) {
         if (itemStack.hasItemMeta()) {
             ItemMeta itemMeta = itemStack.getItemMeta();
-            if (itemMeta.getCustomModelData() != 0) {
-                for (int i = 0; i < Constant.Items.size(); i++) {
-                    ModdedItem item = Constant.Items.get(i);
-                    if (itemMeta.getCustomModelData() - 1 == item.getId() && itemStack.getType() == item.ItemMaterial) {
-                        return item;
+            if (!itemStack.getType().isBlock()) {
+                if (itemMeta.getCustomModelData() != 0) {
+                    for (int i = 0; i < Constant.Items.size(); i++) {
+                        ModdedItem item = Constant.Items.get(i);
+                        if (!item.isBlockItem && itemMeta.getCustomModelData() - 1 == item.getId() && itemStack.getType() == item.ItemMaterial) {
+                            return item;
+                        }
+                    }
+                }
+            } else {
+                if (itemMeta.getCustomModelData() != 0) {
+                    for (int i = 0; i < Constant.Items.size(); i++) {
+                        ModdedItem item = Constant.Items.get(i);
+                        if (item.isBlockItem && itemMeta.getCustomModelData() == item.getId() - 1 && itemStack.getType() == Material.STONE) {
+                            return item;
+                        }
                     }
                 }
             }