Update required FMP version to 1.1.1.321 and add the sawIcons from @wiiv

#87
SlimeKnights · Feb 28, 2015 · df0e4db · df0e4db
1 parent 6feb215
commit df0e4db
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/build.properties b/build.properties
@@ -2,4 +2,4 @@ mod_version=2.1.2
 minecraft_version=1.7.10
 forge_version=10.13.2.1291
 tconstruct_version=1.8.3.build902
-fmp_version=1.1.0.314
+fmp_version=1.1.1.321
diff --git a/resources/assets/iguanatweakstconstruct/textures/items/sawArdite.png b/resources/assets/iguanatweakstconstruct/textures/items/sawArdite.png
diff --git a/resources/assets/iguanatweakstconstruct/textures/items/sawCobalt.png b/resources/assets/iguanatweakstconstruct/textures/items/sawCobalt.png
diff --git a/resources/assets/iguanatweakstconstruct/textures/items/sawManyullyn.png b/resources/assets/iguanatweakstconstruct/textures/items/sawManyullyn.png
diff --git a/src/main/java/iguanaman/iguanatweakstconstruct/modcompat/fmp/ClientFMPProxy.java b/src/main/java/iguanaman/iguanatweakstconstruct/modcompat/fmp/ClientFMPProxy.java
@@ -13,12 +13,18 @@ public void updateSawRenderers() {
         Item ironSaw = MicroblockProxy$.MODULE$.sawIron();
         Item diamondSaw = MicroblockProxy$.MODULE$.sawDiamond();
 
-        MinecraftForgeClient.registerItemRenderer(stoneSaw, new IguanaItemSawRenderer("microblock:textures/items/saw.png", 0));
-        MinecraftForgeClient.registerItemRenderer(ironSaw, new IguanaItemSawRenderer("microblock:textures/items/saw.png", 1));
-        MinecraftForgeClient.registerItemRenderer(diamondSaw, new IguanaItemSawRenderer("microblock:textures/items/saw.png", 2));
+        if(MicroblockProxy$.MODULE$.useSawIcons()) {
+            IguanaFMPCompat.arditeSaw.setTextureName(Reference.resource("sawArdite"));
+            IguanaFMPCompat.cobaltSaw.setTextureName(Reference.resource("sawCobalt"));
+            IguanaFMPCompat.manyullynSaw.setTextureName(Reference.resource("sawManyullyn"));
+        } else {
+            MinecraftForgeClient.registerItemRenderer(stoneSaw, new IguanaItemSawRenderer("microblock:textures/items/saw.png", 0));
+            MinecraftForgeClient.registerItemRenderer(ironSaw, new IguanaItemSawRenderer("microblock:textures/items/saw.png", 1));
+            MinecraftForgeClient.registerItemRenderer(diamondSaw, new IguanaItemSawRenderer("microblock:textures/items/saw.png", 2));
 
-        MinecraftForgeClient.registerItemRenderer(IguanaFMPCompat.arditeSaw, new IguanaItemSawRenderer(Reference.RESOURCE +  ":textures/items/saw.png", 0));
-        MinecraftForgeClient.registerItemRenderer(IguanaFMPCompat.cobaltSaw, new IguanaItemSawRenderer(Reference.RESOURCE +  ":textures/items/saw.png", 1));
-        MinecraftForgeClient.registerItemRenderer(IguanaFMPCompat.manyullynSaw, new IguanaItemSawRenderer(Reference.RESOURCE +  ":textures/items/saw.png", 2));
+            MinecraftForgeClient.registerItemRenderer(IguanaFMPCompat.arditeSaw, new IguanaItemSawRenderer(Reference.RESOURCE +  ":textures/items/saw.png", 0));
+            MinecraftForgeClient.registerItemRenderer(IguanaFMPCompat.cobaltSaw, new IguanaItemSawRenderer(Reference.RESOURCE +  ":textures/items/saw.png", 1));
+            MinecraftForgeClient.registerItemRenderer(IguanaFMPCompat.manyullynSaw, new IguanaItemSawRenderer(Reference.RESOURCE +  ":textures/items/saw.png", 2));
+        }
     }
 }