Undid last commit because it was broken af

pom.xml

@@ -72,6 +72,12 @@
     </repositories>
 
     <dependencies>
+        <dependency>
+            <groupId>com.comphenix.protocol</groupId>
+            <artifactId>ProtocolLib</artifactId>
+            <version>5.1.0</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>

src/main/java/xyz/prismenetwork/kelpmodloader/ModsAPI/Block/CreateBlock.java → src/main/java/xyz/prismenetwork/kelpmodloader/Block/CreateBlock.java

@@ -1,4 +1,4 @@
-package xyz.prismenetwork.kelpmodloader.ModsAPI.Block;
+package xyz.prismenetwork.kelpmodloader.Block;
 
 import org.bukkit.Material;
 import org.bukkit.Server;

src/main/java/xyz/prismenetwork/kelpmodloader/ModsAPI/Block/ModdedBlock.java → src/main/java/xyz/prismenetwork/kelpmodloader/Block/ModdedBlock.java

@@ -1,4 +1,4 @@
-package xyz.prismenetwork.kelpmodloader.ModsAPI.Block;
+package xyz.prismenetwork.kelpmodloader.Block;
 
 public class ModdedBlock {
     public String name;

src/main/java/xyz/prismenetwork/kelpmodloader/ModsAPI/Block/RegisterBlock.java → src/main/java/xyz/prismenetwork/kelpmodloader/Block/RegisterBlock.java

@@ -1,4 +1,4 @@
-package xyz.prismenetwork.kelpmodloader.ModsAPI.Block;
+package xyz.prismenetwork.kelpmodloader.Block;
 
 import xyz.prismenetwork.kelpmodloader.Constant;
 

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

@@ -1,10 +1,10 @@
 package xyz.prismenetwork.kelpmodloader;
 
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Block.ModdedBlock;
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Item.ModdedItem;
+import xyz.prismenetwork.kelpmodloader.Block.ModdedBlock;
+import xyz.prismenetwork.kelpmodloader.Item.ModdedItem;
 import xyz.prismenetwork.kelpmodloader.Mods.ModsObject;
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Models.Model;
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Texture.Texture;
+import xyz.prismenetwork.kelpmodloader.Models.Model;
+import xyz.prismenetwork.kelpmodloader.Texture.Texture;
 
 import java.util.ArrayList;
 

src/main/java/xyz/prismenetwork/kelpmodloader/EventHandler/BlockPlaceEvent.java

@@ -10,7 +10,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Block.ModdedBlock;
+import xyz.prismenetwork.kelpmodloader.Block.ModdedBlock;
 import xyz.prismenetwork.kelpmodloader.Constant;
 import xyz.prismenetwork.kelpmodloader.Utils;
 

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

@@ -1,6 +1,7 @@
-package xyz.prismenetwork.kelpmodloader.ModsAPI.Item;
+package xyz.prismenetwork.kelpmodloader.Item;
 
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Block.ModdedBlock;
+import org.bukkit.Material;
+import xyz.prismenetwork.kelpmodloader.Block.ModdedBlock;
 import xyz.prismenetwork.kelpmodloader.Constant;
 
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package xyz.prismenetwork.kelpmodloader.ModsAPI.Item;
+package xyz.prismenetwork.kelpmodloader.Item;
 
 public class ItemType {
     public static final String Default = "minecraft:item/generated";

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

@@ -1,4 +1,4 @@
-package xyz.prismenetwork.kelpmodloader.ModsAPI.Item;
+package xyz.prismenetwork.kelpmodloader.Item;
 
 import org.bukkit.Material;
 

src/main/java/xyz/prismenetwork/kelpmodloader/ModsAPI/Item/RegisterItem.java → src/main/java/xyz/prismenetwork/kelpmodloader/Item/RegisterItem.java

@@ -1,4 +1,4 @@
-package xyz.prismenetwork.kelpmodloader.ModsAPI.Item;
+package xyz.prismenetwork.kelpmodloader.Item;
 
 import org.bukkit.Material;
 import xyz.prismenetwork.kelpmodloader.Constant;

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

@@ -1,10 +1,11 @@
 package xyz.prismenetwork.kelpmodloader;
 
+import org.bukkit.Material;
 import org.bukkit.plugin.java.JavaPlugin;
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Block.CreateBlock;
+import xyz.prismenetwork.kelpmodloader.Block.CreateBlock;
 import xyz.prismenetwork.kelpmodloader.EventHandler.BlockPlaceEvent;
 import xyz.prismenetwork.kelpmodloader.EventHandler.BlockUpdateEvent;
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Item.GenerateBlockItems;
+import xyz.prismenetwork.kelpmodloader.Item.GenerateBlockItems;
 import xyz.prismenetwork.kelpmodloader.Mods.ModsLoader;
 import xyz.prismenetwork.kelpmodloader.Pack.CreatePack;
 

src/main/java/xyz/prismenetwork/kelpmodloader/ModsAPI/Models/JsonModels.java → src/main/java/xyz/prismenetwork/kelpmodloader/Models/JsonModels.java

@@ -1,4 +1,4 @@
-package xyz.prismenetwork.kelpmodloader.ModsAPI.Models;
+package xyz.prismenetwork.kelpmodloader.Models;
 
 import java.util.ArrayList;
 

src/main/java/xyz/prismenetwork/kelpmodloader/ModsAPI/Models/Model.java → src/main/java/xyz/prismenetwork/kelpmodloader/Models/Model.java

@@ -1,7 +1,9 @@
-package xyz.prismenetwork.kelpmodloader.ModsAPI.Models;
+package xyz.prismenetwork.kelpmodloader.Models;
 
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Texture.Texture;
+import xyz.prismenetwork.kelpmodloader.Item.ItemType;
+import xyz.prismenetwork.kelpmodloader.Texture.Texture;
 
+import java.io.File;
 import java.io.InputStream;
 import java.util.HashMap;
 

src/main/java/xyz/prismenetwork/kelpmodloader/ModsAPI/Models/ModelType.java → src/main/java/xyz/prismenetwork/kelpmodloader/Models/ModelType.java

@@ -1,4 +1,6 @@
-package xyz.prismenetwork.kelpmodloader.ModsAPI.Models;
+package xyz.prismenetwork.kelpmodloader.Models;
+
+import xyz.prismenetwork.kelpmodloader.Texture.TextureType;
 
 public class ModelType {
     public static ModelType Block() {

src/main/java/xyz/prismenetwork/kelpmodloader/ModsAPI/Models/RegisterModels.java → src/main/java/xyz/prismenetwork/kelpmodloader/Models/RegisterModels.java

@@ -1,7 +1,10 @@
-package xyz.prismenetwork.kelpmodloader.ModsAPI.Models;
+package xyz.prismenetwork.kelpmodloader.Models;
 
+import org.bukkit.Material;
 import xyz.prismenetwork.kelpmodloader.Constant;
+import xyz.prismenetwork.kelpmodloader.Item.ModdedItem;
 
+import java.io.File;
 import java.io.InputStream;
 
 public class RegisterModels {

src/main/java/xyz/prismenetwork/kelpmodloader/Mods/ModsLoader.java

@@ -1,18 +1,20 @@
 package xyz.prismenetwork.kelpmodloader.Mods;
 
 import org.bukkit.Material;
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Block.RegisterBlock;
+import org.slf4j.Logger;
+import xyz.prismenetwork.kelpmodloader.Block.RegisterBlock;
 import xyz.prismenetwork.kelpmodloader.Constant;
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Item.RegisterItem;
+import xyz.prismenetwork.kelpmodloader.Item.RegisterItem;
 import xyz.prismenetwork.kelpmodloader.KelpModLoader;
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Models.ModelType;
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Models.RegisterModels;
+import xyz.prismenetwork.kelpmodloader.Models.ModelType;
+import xyz.prismenetwork.kelpmodloader.Models.RegisterModels;
 import xyz.prismenetwork.kelpmodloader.ModsAPI.Mods;
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Texture.RegisterTexture;
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Texture.TextureType;
+import xyz.prismenetwork.kelpmodloader.Texture.RegisterTexture;
+import xyz.prismenetwork.kelpmodloader.Texture.TextureType;
 
 import java.io.*;
 import java.lang.reflect.Method;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.file.Path;

src/main/java/xyz/prismenetwork/kelpmodloader/ModsAPI/ItemUtils.java

@@ -3,9 +3,9 @@
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Block.ModdedBlock;
+import xyz.prismenetwork.kelpmodloader.Block.ModdedBlock;
 import xyz.prismenetwork.kelpmodloader.Constant;
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Item.ModdedItem;
+import xyz.prismenetwork.kelpmodloader.Item.ModdedItem;
 
 public class ItemUtils {
     public static boolean isModed(ItemStack itemStack) {

src/main/java/xyz/prismenetwork/kelpmodloader/ModsAPI/Mods.java

@@ -3,10 +3,14 @@
 import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.plugin.Plugin;
+import xyz.prismenetwork.kelpmodloader.Constant;
+import xyz.prismenetwork.kelpmodloader.Item.ItemType;
 import xyz.prismenetwork.kelpmodloader.KelpModLoader;
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Models.ModelType;
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Texture.TextureType;
+import xyz.prismenetwork.kelpmodloader.Models.ModelType;
+import xyz.prismenetwork.kelpmodloader.Texture.TextureType;
 
+import java.io.File;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 

src/main/java/xyz/prismenetwork/kelpmodloader/Pack/GenerateModel.java

@@ -1,9 +1,9 @@
 package xyz.prismenetwork.kelpmodloader.Pack;
 
 import org.bukkit.Material;
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Block.ModdedBlock;
+import xyz.prismenetwork.kelpmodloader.Block.ModdedBlock;
 import xyz.prismenetwork.kelpmodloader.Constant;
-import xyz.prismenetwork.kelpmodloader.ModsAPI.Item.ModdedItem;
+import xyz.prismenetwork.kelpmodloader.Item.ModdedItem;
 import xyz.prismenetwork.kelpmodloader.KelpModLoader;
 
 import java.io.BufferedWriter;

src/main/java/xyz/prismenetwork/kelpmodloader/ModsAPI/Texture/RegisterTexture.java → src/main/java/xyz/prismenetwork/kelpmodloader/Texture/RegisterTexture.java

@@ -1,4 +1,4 @@
-package xyz.prismenetwork.kelpmodloader.ModsAPI.Texture;
+package xyz.prismenetwork.kelpmodloader.Texture;
 
 import xyz.prismenetwork.kelpmodloader.Constant;
 

src/main/java/xyz/prismenetwork/kelpmodloader/ModsAPI/Texture/Texture.java → src/main/java/xyz/prismenetwork/kelpmodloader/Texture/Texture.java

@@ -1,4 +1,4 @@
-package xyz.prismenetwork.kelpmodloader.ModsAPI.Texture;
+package xyz.prismenetwork.kelpmodloader.Texture;
 
 import java.io.InputStream;
 

src/main/java/xyz/prismenetwork/kelpmodloader/ModsAPI/Texture/TextureType.java → src/main/java/xyz/prismenetwork/kelpmodloader/Texture/TextureType.java

@@ -1,4 +1,4 @@
-package xyz.prismenetwork.kelpmodloader.ModsAPI.Texture;
+package xyz.prismenetwork.kelpmodloader.Texture;
 
 public class TextureType {
     public static TextureType Block() {

src/main/resources/plugin.yml

@@ -2,3 +2,5 @@ name: KelpModLoader
 version: '${project.version}'
 main: xyz.prismenetwork.kelpmodloader.KelpModLoader
 api-version: '1.20'
+depend:
+  - ProtocolLib