Old mod loader code cleanup

Hilligans · Mar 26, 2024 · 13ffa5f · 13ffa5f
1 parent bd3a338
commit 13ffa5f
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 675 deletions.
diff --git a/src/main/java/dev/hilligans/ourcraft/GameInstance.java b/src/main/java/dev/hilligans/ourcraft/GameInstance.java
@@ -29,7 +29,6 @@
 import dev.hilligans.ourcraft.mod.handler.EventBus;
 import dev.hilligans.ourcraft.mod.handler.content.ModList;
 import dev.hilligans.ourcraft.mod.handler.events.common.RegistryClearEvent;
-import dev.hilligans.ourcraft.mod.handler.ModLoader;
 import dev.hilligans.ourcraft.mod.handler.pipeline.InstanceLoaderPipeline;
 import dev.hilligans.ourcraft.network.Protocol;
 import dev.hilligans.ourcraft.recipe.helper.RecipeView;
@@ -61,7 +60,6 @@
 
 public class GameInstance {
     public final EventBus EVENT_BUS = new EventBus();
-    public final ModLoader MOD_LOADER = new ModLoader(this);
     public final Logger LOGGER = new Logger("", "");
     public final ResourceManager RESOURCE_MANAGER = new ResourceManager(this);
     public final ModContent OURCRAFT = new ModContent("ourcraft",this).addClassLoader(new URLClassLoader(new URL[]{Ourcraft.class.getProtectionDomain().getCodeSource().getLocation()})).addMainClass(Ourcraft.class);

diff --git a/src/main/java/dev/hilligans/ourcraft/item/Item.java b/src/main/java/dev/hilligans/ourcraft/item/Item.java
@@ -29,7 +29,7 @@ public class Item implements IRecipeComponent, IRegistryElement {
     public Item(String name, ItemProperties itemProperties) {
         this.name = name;
         this.itemProperties = itemProperties;
-        this.modID = Ourcraft.GAME_INSTANCE.MOD_LOADER.mod;
+       // this.modID = Ourcraft.GAME_INSTANCE.MOD_LOADER.mod;
         id = Items.getNextId();
     }
 

diff --git a/src/main/java/dev/hilligans/ourcraft/mod/handler/ModLoader.java b/src/main/java/dev/hilligans/ourcraft/mod/handler/ModLoader.java