Move model loaders to their respective modules

KnightMiner · Aug 30, 2020 · 3383872 · 3383872
1 parent ed3c317
commit 3383872
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/src/main/java/knightminer/inspirations/building/BuildingClientEvents.java b/src/main/java/knightminer/inspirations/building/BuildingClientEvents.java
@@ -7,6 +7,7 @@
 import knightminer.inspirations.common.ClientEvents;
 import knightminer.inspirations.library.Util;
 import knightminer.inspirations.library.client.ClientUtil;
+import knightminer.inspirations.library.client.model.BookshelfModel;
 import knightminer.inspirations.shared.client.BackgroundContainerScreen;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
@@ -21,6 +22,8 @@
 import net.minecraft.world.biome.BiomeColors;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.ColorHandlerEvent;
+import net.minecraftforge.client.event.ModelRegistryEvent;
+import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
@@ -63,6 +66,11 @@ static void clientSetup(FMLClientSetupEvent event) {
     InspirationsBuilding.flowerPot.forEach(setCutout);
   }
 
+  @SubscribeEvent
+  static void registerModelLoaders(ModelRegistryEvent event) {
+    ModelLoaderRegistry.registerLoader(Inspirations.getResource("bookshelf"), BookshelfModel.LOADER);
+  }
+
   @SubscribeEvent
   static void commonSetup(FMLCommonSetupEvent event) {
     // Register GUIs.

diff --git a/src/main/java/knightminer/inspirations/shared/SharedClientEvents.java b/src/main/java/knightminer/inspirations/shared/SharedClientEvents.java
@@ -5,16 +5,12 @@
 import knightminer.inspirations.common.ClientEvents;
 import knightminer.inspirations.library.client.ClientUtil;
 import knightminer.inspirations.library.client.ConfigurableResourcePack;
-import knightminer.inspirations.library.client.model.BookshelfModel;
-import knightminer.inspirations.library.client.model.TrimModel;
 import net.minecraft.client.Minecraft;
 import net.minecraft.resources.IReloadableResourceManager;
 import net.minecraft.resources.IResourceManager;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.ModelBakeEvent;
-import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.client.model.ModelLoader;
-import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
@@ -37,12 +33,6 @@ public static void onConstruct() {
     }
   }
 
-  @SubscribeEvent
-  static void registerModelLoaders(ModelRegistryEvent event) {
-    ModelLoaderRegistry.registerLoader(Inspirations.getResource("bookshelf"), BookshelfModel.LOADER);
-    ModelLoaderRegistry.registerLoader(Inspirations.getResource("trim"), TrimModel.LOADER);
-  }
-
   @SubscribeEvent
   static void setup(FMLCommonSetupEvent event) {
     // listener to clear color cache from client utils

diff --git a/src/main/java/knightminer/inspirations/tweaks/TweaksClientEvents.java b/src/main/java/knightminer/inspirations/tweaks/TweaksClientEvents.java
@@ -3,6 +3,7 @@
 import knightminer.inspirations.Inspirations;
 import knightminer.inspirations.common.ClientEvents;
 import knightminer.inspirations.common.Config;
+import knightminer.inspirations.library.client.model.TrimModel;
 import knightminer.inspirations.shared.SharedClientEvents;
 import knightminer.inspirations.tweaks.client.PortalColorHandler;
 import net.minecraft.block.Blocks;
@@ -23,6 +24,7 @@
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.ColorHandlerEvent;
 import net.minecraftforge.client.event.ModelRegistryEvent;
+import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
@@ -53,6 +55,11 @@ static void modelRegistry(ModelRegistryEvent event) {
     SharedClientEvents.configPack.addItemModelReplacement(Config.betterCauldronItem, Items.CAULDRON, () -> Config.extendedCauldron.getAsBoolean() ? "cauldron" : "cauldron_vanilla");
   }
 
+  @SubscribeEvent
+  static void registerModelLoaders(ModelRegistryEvent event) {
+    ModelLoaderRegistry.registerLoader(Inspirations.getResource("trim"), TrimModel.LOADER);
+  }
+
   @SubscribeEvent
   static void registerBlockColors(ColorHandlerEvent.Block event) {
     BlockColors colors = event.getBlockColors();