Added Mansion Compass and fixed issue where models were loaded twice

src/main/java/net/yseven/findyourway/Client/ClientProxy.java

@@ -80,19 +80,6 @@ public class ClientProxy extends CommonProxy {
             ModItems.registerModels();
         }
 
-    @SubscribeEvent
-    public void onModelRegistry(ModelRegistryEvent event) {
-        registerModel(ModItems.ENDER_COMPASS);
-        registerModel(ModItems.VILLAGE_COMPASS);
-        registerModel(ModItems.FORTRESS_COMPASS);
-        registerModel(ModItems.MONUMENT_COMPASS);
-    }
-
-    private void registerModel(ItemCompassBase compass) {
-        compass.addPropertyOverride(new ResourceLocation("angle"), new AngleGetter());
-        ModelLoader.setCustomModelResourceLocation(compass, 0, new ModelResourceLocation(FindYourWay.modId + ":" + compass.getUnlocalizedName()));
-    }
-
     @SubscribeEvent
     public void onClientTick(TickEvent.ClientTickEvent event) {
         for(int i = 0; i < CommonProxy.compassList.size(); i++) {

src/main/java/net/yseven/findyourway/CommonProxy.java

@@ -48,10 +48,7 @@ public class CommonProxy {
 
     @SubscribeEvent
     public static void registerItems(RegistryEvent.Register<Item> event) {
-        event.getRegistry().register(ModItems.ENDER_COMPASS);
-        event.getRegistry().register(ModItems.VILLAGE_COMPASS);
-        event.getRegistry().register(ModItems.FORTRESS_COMPASS);
-        event.getRegistry().register(ModItems.MONUMENT_COMPASS);
+        ModItems.registerItems(event);
     }
 
     public static boolean containsCompass(IInventory inventory, ItemCompassBase compass) {
@@ -63,26 +60,4 @@ public class CommonProxy {
         }
         return false;
     }
-
-    public static int setCompassId(ItemCompassBase compass) {
-        switch (compass.getStructureType()){
-            case "Stronghold": return 1;
-            case "Village": return 2;
-            case "Fortress": return 3;
-            case "Monument": return 4;
-            default: return 0;
-        }
-    }
-
-    public static ItemCompassBase getCompassId(int id) {
-        switch (id) {
-            case 1: return ModItems.ENDER_COMPASS;
-            case 2: return ModItems.VILLAGE_COMPASS;
-            case 3: return ModItems.FORTRESS_COMPASS;
-            case 4: return ModItems.MONUMENT_COMPASS;
-            default:
-                ItemCompassBase ERROR_COMPASS = new ItemCompassBase("error", "");
-                return ERROR_COMPASS;
-        }
-    }
 }

src/main/java/net/yseven/findyourway/item/ItemCompassBase.java

@@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.ModelRegistryEvent;
@@ -16,6 +17,7 @@ import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import net.yseven.findyourway.Client.AngleGetter;
 import net.yseven.findyourway.Client.ClientProxy;
 import net.yseven.findyourway.CommonProxy;
 import net.yseven.findyourway.FindYourWay;
@@ -89,7 +91,8 @@ public class ItemCompassBase extends Item {
     @SideOnly(Side.CLIENT)
     @SubscribeEvent
     public void registerItemModel() {
-        ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory"));
+        this.addPropertyOverride(new ResourceLocation("angle"), new AngleGetter());
+        ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(FindYourWay.modId + ":" + this.getUnlocalizedName(), "inventory"));
     }
 
     @Override

src/main/java/net/yseven/findyourway/item/ModItems.java

@@ -1,5 +1,7 @@
 package net.yseven.findyourway.item;
 
+import net.minecraft.item.Item;
+import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -12,12 +14,14 @@ public class ModItems {
     public static ItemCompassBase VILLAGE_COMPASS;
     public static ItemCompassBase FORTRESS_COMPASS;
     public static ItemCompassBase MONUMENT_COMPASS;
+    public static ItemCompassBase MANSION_COMPASS;
 
     public static void init(){
         ENDER_COMPASS = new ItemCompassBase("ender_compass", "Stronghold");
         VILLAGE_COMPASS = new ItemCompassBase("village_compass", "Village");
         FORTRESS_COMPASS = new ItemCompassBase("fortress_compass", "Fortress");
         MONUMENT_COMPASS = new ItemCompassBase("monument_compass", "Monument");
+        MANSION_COMPASS = new ItemCompassBase("mansion_compass", "Mansion");
     }
 
     @SideOnly(Side.CLIENT)
@@ -26,5 +30,14 @@ public class ModItems {
         VILLAGE_COMPASS.registerItemModel();
         FORTRESS_COMPASS.registerItemModel();
         MONUMENT_COMPASS.registerItemModel();
+        MANSION_COMPASS.registerItemModel();
+    }
+
+    public static void registerItems(RegistryEvent.Register<Item> event) {
+        event.getRegistry().register(ENDER_COMPASS);
+        event.getRegistry().register(VILLAGE_COMPASS);
+        event.getRegistry().register(FORTRESS_COMPASS);
+        event.getRegistry().register(MONUMENT_COMPASS);
+        event.getRegistry().register(MANSION_COMPASS);
     }
 }

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass.json

@@ -0,0 +1,52 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_16"
+    },
+    "defaults": {
+        "textures": {
+            "layer0": "findyourway:items/mansion_compass_16"
+        }
+    },
+    "variants": {
+        "normal": [{
+            }],
+        "inventory": [{
+            }]
+    },
+    "overrides": [
+        { "predicate": { "angle": 0.000000 }, "model": "findyourway:item/item.findyourway.mansion_compass_16" },
+        { "predicate": { "angle": 0.015625 }, "model": "findyourway:item/item.findyourway.mansion_compass_17" },
+        { "predicate": { "angle": 0.046875 }, "model": "findyourway:item/item.findyourway.mansion_compass_18" },
+        { "predicate": { "angle": 0.078125 }, "model": "findyourway:item/item.findyourway.mansion_compass_19" },
+        { "predicate": { "angle": 0.109375 }, "model": "findyourway:item/item.findyourway.mansion_compass_20" },
+        { "predicate": { "angle": 0.140625 }, "model": "findyourway:item/item.findyourway.mansion_compass_21" },
+        { "predicate": { "angle": 0.171875 }, "model": "findyourway:item/item.findyourway.mansion_compass_22" },
+        { "predicate": { "angle": 0.203125 }, "model": "findyourway:item/item.findyourway.mansion_compass_23" },
+        { "predicate": { "angle": 0.234375 }, "model": "findyourway:item/item.findyourway.mansion_compass_24" },
+        { "predicate": { "angle": 0.265625 }, "model": "findyourway:item/item.findyourway.mansion_compass_25" },
+        { "predicate": { "angle": 0.296875 }, "model": "findyourway:item/item.findyourway.mansion_compass_26" },
+        { "predicate": { "angle": 0.328125 }, "model": "findyourway:item/item.findyourway.mansion_compass_27" },
+        { "predicate": { "angle": 0.359375 }, "model": "findyourway:item/item.findyourway.mansion_compass_28" },
+        { "predicate": { "angle": 0.390625 }, "model": "findyourway:item/item.findyourway.mansion_compass_29" },
+        { "predicate": { "angle": 0.421875 }, "model": "findyourway:item/item.findyourway.mansion_compass_30" },
+        { "predicate": { "angle": 0.453125 }, "model": "findyourway:item/item.findyourway.mansion_compass_31" },
+        { "predicate": { "angle": 0.484375 }, "model": "findyourway:item/item.findyourway.mansion_compass_00" },
+        { "predicate": { "angle": 0.515625 }, "model": "findyourway:item/item.findyourway.mansion_compass_01" },
+        { "predicate": { "angle": 0.546875 }, "model": "findyourway:item/item.findyourway.mansion_compass_02" },
+        { "predicate": { "angle": 0.578125 }, "model": "findyourway:item/item.findyourway.mansion_compass_03" },
+        { "predicate": { "angle": 0.609375 }, "model": "findyourway:item/item.findyourway.mansion_compass_04" },
+        { "predicate": { "angle": 0.640625 }, "model": "findyourway:item/item.findyourway.mansion_compass_05" },
+        { "predicate": { "angle": 0.671875 }, "model": "findyourway:item/item.findyourway.mansion_compass_06" },
+        { "predicate": { "angle": 0.703125 }, "model": "findyourway:item/item.findyourway.mansion_compass_07" },
+        { "predicate": { "angle": 0.734375 }, "model": "findyourway:item/item.findyourway.mansion_compass_08" },
+        { "predicate": { "angle": 0.765625 }, "model": "findyourway:item/item.findyourway.mansion_compass_09" },
+        { "predicate": { "angle": 0.796875 }, "model": "findyourway:item/item.findyourway.mansion_compass_10" },
+        { "predicate": { "angle": 0.828125 }, "model": "findyourway:item/item.findyourway.mansion_compass_11" },
+        { "predicate": { "angle": 0.859375 }, "model": "findyourway:item/item.findyourway.mansion_compass_12" },
+        { "predicate": { "angle": 0.890625 }, "model": "findyourway:item/item.findyourway.mansion_compass_13" },
+        { "predicate": { "angle": 0.921875 }, "model": "findyourway:item/item.findyourway.mansion_compass_14" },
+        { "predicate": { "angle": 0.953125 }, "model": "findyourway:item/item.findyourway.mansion_compass_15" },
+        { "predicate": { "angle": 0.984375 }, "model": "findyourway:item/item.findyourway.mansion_compass_16" }
+    ]
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_00.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_00"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_01.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_01"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_02.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_02"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_03.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_03"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_04.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_04"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_05.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_05"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_06.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_06"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_07.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_07"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_08.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_08"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_09.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_09"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_10.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_10"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_11.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_11"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_12.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_12"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_13.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_13"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_14.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_14"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_15.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_15"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_16.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_16"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_17.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_17"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_18.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_18"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_19.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_19"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_20.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_20"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_21.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_21"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_22.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_22"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_23.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_23"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_24.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_24"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_25.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_25"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_26.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_26"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_27.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_27"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_28.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_28"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_29.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_29"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_30.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_30"
+    }
+}

src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_31.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "findyourway:items/mansion_compass_31"
+    }
+}