Merge pull request #62 from MrTommyt/1.16.x

Model loader changed and hats folder moved to the models folder

crafting-dead-core/src/main/java/com/craftingdead/core/CraftingDead.java

@@ -18,6 +18,8 @@
 package com.craftingdead.core;
 
 import java.util.ListIterator;
+
+import net.minecraftforge.client.model.ModelLoaderRegistry;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

crafting-dead-core/src/main/java/com/craftingdead/core/client/ClientDist.java

@@ -17,11 +17,6 @@
  */
 package com.craftingdead.core.client;
 
-import java.util.Collection;
-import java.util.Optional;
-import java.util.function.Function;
-import org.apache.commons.lang3.tuple.Pair;
-import org.lwjgl.glfw.GLFW;
 import com.craftingdead.core.CraftingDead;
 import com.craftingdead.core.IModDist;
 import com.craftingdead.core.capability.ModCapabilities;
@@ -36,7 +31,6 @@
 import com.craftingdead.core.client.gui.IngameGui;
 import com.craftingdead.core.client.gui.screen.inventory.GenericContainerScreen;
 import com.craftingdead.core.client.gui.screen.inventory.PlayerScreen;
-import com.craftingdead.core.client.model.PerspectiveAwareModel;
 import com.craftingdead.core.client.particle.GrenadeSmokeParticle;
 import com.craftingdead.core.client.particle.RGBFlashParticle;
 import com.craftingdead.core.client.renderer.CameraManager;
@@ -119,7 +113,6 @@
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.client.event.sound.SoundLoadEvent;
 import net.minecraftforge.client.model.ModelLoader;
-import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.AttachCapabilitiesEvent;
@@ -135,6 +128,12 @@
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import org.apache.commons.lang3.tuple.Pair;
+import org.lwjgl.glfw.GLFW;
+
+import java.util.Collection;
+import java.util.Optional;
+import java.util.function.Function;
 
 public class ClientDist implements IModDist {
 
@@ -291,8 +290,6 @@ public void handleSoundLoad(SoundLoadEvent event) {
 
   private void handleModelRegistry(ModelRegistryEvent event) {
     StartupMessageManager.addModMessage("Registering model loaders");
-    ModelLoaderRegistry.registerLoader(new ResourceLocation(CraftingDead.ID, "perspective_aware"),
-        PerspectiveAwareModel.Loader.INSTANCE);
     StartupMessageManager.addModMessage("Gathering item renderers");
     this.itemRendererManager.gatherItemRenderers();
     StartupMessageManager.addModMessage("Registering special models");

crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/ballistic_helmet.json → crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/ballistic_helmet.json

@@ -1,6 +1,6 @@
 {
 	"loader":"forge:obj",
-	"model":"craftingdead:models/item/hats/ballistic_helmet.obj",
+	"model":"craftingdead:models/hats/ballistic_helmet.obj",
 	"flip-v":true,
 	"ambientToFullbright": false,
 	"transform": {

crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/bunny_hat.json → crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/bunny_hat.json

@@ -1,6 +1,6 @@
 {
 	"loader":"forge:obj",
-	"model":"craftingdead:models/item/hats/bunny_hat.obj",
+	"model":"craftingdead:models/hats/bunny_hat.obj",
 	"flip-v":true,
 	"ambientToFullbright": false
 }

crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/fireman_hat.json → crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/chief_fireman_hat.json

@@ -1,6 +1,6 @@
 {
 	"loader":"forge:obj",
-	"model":"craftingdead:models/item/hats/fireman_hat.obj",
+	"model":"craftingdead:models/hats/chief_fireman_hat.obj",
 	"flip-v":true,
 	"ambientToFullbright": false
 }

crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/fireman_hat.json

@@ -0,0 +1,6 @@
+{
+	"loader":"forge:obj",
+	"model":"craftingdead:models/hats/fireman_hat.obj",
+	"flip-v":true,
+	"ambientToFullbright": false
+}