Switch to json model for spikes

src/main/java/com/fouristhenumber/utilitiesinexcess/UtilitiesInExcess.java

@@ -14,7 +14,6 @@
 import com.fouristhenumber.utilitiesinexcess.common.recipe.RecipeLoader;
 import com.fouristhenumber.utilitiesinexcess.common.renderers.BlackoutCurtainsRenderer;
 import com.fouristhenumber.utilitiesinexcess.common.renderers.LapisAetheriusRenderer;
-import com.fouristhenumber.utilitiesinexcess.common.renderers.SpikeRenderer;
 import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityBlockUpdateDetector;
 import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityConveyor;
 import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityDrum;
@@ -79,7 +78,6 @@ public class UtilitiesInExcess {
 
     public static int lapisAetheriusRenderID;
     public static int blackoutCurtainsRenderID;
-    public static int spikeRenderID;
 
     @SidedProxy(
         clientSide = "com.fouristhenumber.utilitiesinexcess.ClientProxy",
@@ -88,7 +86,6 @@ public class UtilitiesInExcess {
 
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
-        GameRegistry.registerTileEntity(TileEntitySpike.class, "utilitiesinexcess:TileEntitySpike");
         proxy.preInit(event);
     }
 
@@ -103,6 +100,7 @@ public void init(FMLInitializationEvent event) {
             .bus()
             .register(new FMLEventHandler());
 
+        GameRegistry.registerTileEntity(TileEntitySpike.class, "TileEntitySpikeUIE");
         GameRegistry.registerTileEntity(TileEntityRedstoneClock.class, "TileEntityRedstoneClockUIE");
         GameRegistry.registerTileEntity(TileEntityTrashCanItem.class, "TileEntityTrashCanItemUIE");
         GameRegistry.registerTileEntity(TileEntityTrashCanFluid.class, "TileEntityTrashCanFluidUIE");
@@ -116,9 +114,6 @@ public void init(FMLInitializationEvent event) {
         GameRegistry.registerTileEntity(TileEntityRadicallyReducedChest.class, "TileEntityRadicallyReducedChestUIE");
         GameRegistry.registerTileEntity(TileEntitySoundMuffler.class, "TileEntitySoundMufflerUIE");
         GameRegistry.registerTileEntity(TileEntityRainMuffler.class, "TileEntityRainMufflerUIE");
-        GameRegistry.registerTileEntity(TileEntityBlockUpdateDetector.class, "TileEntityBlockUpdateDetector");
-        GameRegistry.registerTileEntity(TileEntityConveyor.class, "TileEntityConveyor");
-        GameRegistry.registerTileEntity(TileEntityPortalUnderWorld.class, "TileEntityPortalUnderWorld");
         GameRegistry.registerTileEntity(TileEntityBlockUpdateDetector.class, "TileEntityBlockUpdateDetectorUIE");
         GameRegistry.registerTileEntity(TileEntityConveyor.class, "TileEntityConveyorUIE");
         GameRegistry.registerTileEntity(TileEntityPortalUnderWorld.class, "TileEntityPortalUnderWorldUIE");
@@ -145,8 +140,6 @@ public void init(FMLInitializationEvent event) {
         RenderingRegistry.registerBlockHandler(new LapisAetheriusRenderer());
         blackoutCurtainsRenderID = RenderingRegistry.getNextAvailableRenderId();
         RenderingRegistry.registerBlockHandler(new BlackoutCurtainsRenderer());
-        spikeRenderID = RenderingRegistry.getNextAvailableRenderId();
-        RenderingRegistry.registerBlockHandler(new SpikeRenderer());
 
         GameRegistry.registerWorldGenerator(new WorldGenEnderLotus(), 10);
 

src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockSpike.java

@@ -1,7 +1,5 @@
 package com.fouristhenumber.utilitiesinexcess.common.blocks;
 
-import static com.fouristhenumber.utilitiesinexcess.UtilitiesInExcess.spikeRenderID;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -21,6 +19,7 @@
 
 import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntitySpike;
 import com.google.common.collect.Multimap;
+import com.gtnewhorizon.gtnhlib.client.model.ModelISBRH;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -126,18 +125,18 @@ public boolean hasTileEntity(int meta) {
     }
 
     @Override
-    public boolean renderAsNormalBlock() {
-        return false;
+    public int getRenderType() {
+        return ModelISBRH.JSON_ISBRH_ID;
     }
 
     @Override
-    public boolean isOpaqueCube() {
+    public boolean renderAsNormalBlock() {
         return false;
     }
 
     @Override
-    public int getRenderType() {
-        return spikeRenderID;
+    public boolean isOpaqueCube() {
+        return false;
     }
 
     private final static IIcon[] icons = new IIcon[4];

src/main/resources/assets/utilitiesinexcess/blockstates/diamond_spike.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "meta=0": { "model": "utilitiesinexcess:blocks/diamond_spike"}
+  }
+}

src/main/resources/assets/utilitiesinexcess/blockstates/gold_spike.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "meta=0": { "model": "utilitiesinexcess:blocks/gold_spike"}
+  }
+}

src/main/resources/assets/utilitiesinexcess/blockstates/iron_spike.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "meta=0": { "model": "utilitiesinexcess:blocks/iron_spike"}
+  }
+}

src/main/resources/assets/utilitiesinexcess/blockstates/wood_spike.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "meta=0": { "model": "utilitiesinexcess:blocks/wood_spike"}
+  }
+}

src/main/resources/assets/utilitiesinexcess/models/blocks/diamond_spike.json

@@ -0,0 +1,6 @@
+{
+  "parent": "utilitiesinexcess:blocks/wood_spike",
+  "textures": {
+    "0": "utilitiesinexcess:models/diamond_spike"
+  }
+}

src/main/resources/assets/utilitiesinexcess/models/blocks/gold_spike.json

@@ -0,0 +1,6 @@
+{
+  "parent": "utilitiesinexcess:blocks/wood_spike",
+  "textures": {
+    "0": "utilitiesinexcess:models/gold_spike"
+  }
+}

src/main/resources/assets/utilitiesinexcess/models/blocks/iron_spike.json

@@ -0,0 +1,6 @@
+{
+  "parent": "utilitiesinexcess:blocks/wood_spike",
+  "textures": {
+    "0": "utilitiesinexcess:models/iron_spike"
+  }
+}