Moved some renderer to use Techne loader

electrical/src/main/java/resonantinduction/electrical/generator/BlockGenerator.java

@@ -15,7 +15,7 @@ public class BlockGenerator extends BlockRotatable
 	public BlockGenerator(int id)
 	{
 		super(id, UniversalElectricity.machine);
-		setTextureName(Reference.PREFIX + "material_steel");
+		setTextureName(Reference.PREFIX + "material_stone");
 		rotationMask = Byte.parseByte("111111", 2);
 	}
 

electrical/src/main/java/resonantinduction/electrical/generator/RenderGenerator.java

@@ -1,17 +1,19 @@
 package resonantinduction.electrical.generator;
 
-import static org.lwjgl.opengl.GL11.glPopMatrix;
-import static org.lwjgl.opengl.GL11.glPushMatrix;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.client.model.AdvancedModelLoader;
+import net.minecraftforge.client.model.IModelCustom;
+import net.minecraftforge.common.ForgeDirection;
 
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.core.Reference;
+import calclavia.lib.render.RenderUtility;
 import calclavia.lib.render.block.ICustomBlockRenderer;
 
 /**
@@ -20,8 +22,8 @@ import calclavia.lib.render.block.ICustomBlockRenderer;
  */
 public class RenderGenerator extends TileEntitySpecialRenderer implements ICustomBlockRenderer
 {
+	public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(Reference.MODEL_DIRECTORY + "generator.tcn");
 	public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "generator.png");
-	public static final ModelGenerator MODEL = new ModelGenerator();
 
 	@Override
 	public void renderTileEntityAt(TileEntity t, double x, double y, double z, float f)
@@ -31,38 +33,13 @@ public class RenderGenerator extends TileEntitySpecialRenderer implements ICusto
 
 	private void doRender(TileEntity t, int facingDirection, double x, double y, double z, float f)
 	{
-		glPushMatrix();
-		GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
+		GL11.glPushMatrix();
+		GL11.glTranslatef((float) x + 0.5f, (float) y + 0.5f, (float) z + 0.5f);
+		GL11.glRotatef(90, 0, 1, 0);
+		RenderUtility.rotateBlockBasedOnDirection(ForgeDirection.getOrientation(facingDirection));
 		bindTexture(TEXTURE);
-		GL11.glRotatef(180, 0f, 0f, 1f);
-
-		// Rotate the model
-		switch (facingDirection)
-		{
-			case 0:
-				GL11.glRotatef(90, 1, 0, 0);
-				GL11.glTranslatef(0, -1, -1);
-				break;
-			case 1:
-				GL11.glRotatef(-90, 1, 0, 0);
-				GL11.glTranslatef(0, -1, 1);
-				break;
-			case 2:
-				GL11.glRotatef(180, 0f, 1f, 0f);
-				break;
-			case 3:
-				GL11.glRotatef(0, 0f, 1f, 0f);
-				break;
-			case 4:
-				GL11.glRotatef(90, 0f, 1f, 0f);
-				break;
-			case 5:
-				GL11.glRotatef(-90, 0f, 1f, 0f);
-				break;
-		}
-
-		MODEL.render(0.0625F);
-		glPopMatrix();
+		MODEL.renderAll();
+		GL11.glPopMatrix();
 	}
 
 	@Override

mechanical/src/main/java/resonantinduction/mechanical/process/purifier/RenderMixer.java

@@ -4,18 +4,18 @@ import static org.lwjgl.opengl.GL11.glPopMatrix;
 import static org.lwjgl.opengl.GL11.glPushMatrix;
 import static org.lwjgl.opengl.GL11.glRotatef;
 import static org.lwjgl.opengl.GL11.glTranslatef;
-
-import org.lwjgl.opengl.GL11;
-
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.AdvancedModelLoader;
+import net.minecraftforge.client.model.IModelCustom;
+
+import org.lwjgl.opengl.GL11;
+
 import resonantinduction.core.Reference;
 import calclavia.lib.render.RenderUtility;
 import calclavia.lib.render.item.ISimpleItemRenderer;
-import calclavia.lib.render.model.TechneAdvancedModel;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -26,7 +26,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 @SideOnly(Side.CLIENT)
 public class RenderMixer extends TileEntitySpecialRenderer implements ISimpleItemRenderer
 {
-	public static final TechneAdvancedModel MODEL = (TechneAdvancedModel) AdvancedModelLoader.loadModel(Reference.MODEL_DIRECTORY + "mixer.tcn");
+	public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(Reference.MODEL_DIRECTORY + "mixer.tcn");
 	public static ResourceLocation TEXTURE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "mixer.png");
 
 	@Override

src/main/resources/assets/resonantinduction/models/model.xml

@@ -1,154 +0,0 @@
-<Techne Version="2.2">
-  <Author>ZeuX</Author>
-  <DateCreated></DateCreated>
-  <Description></Description>
-  <Models>
-    <Model texture="Newtexture.png" textureSize="128,64">
-      <BaseClass>ModelBase</BaseClass>
-      <Geometry>
-        <Shape type="d9e621f7-957f-4b77-b1ae-20dcd0da7751" name="centerTop">
-          <Animation>
-            <AnimationAngles>0,0,0</AnimationAngles>
-            <AnimationDuration>0,0,0</AnimationDuration>
-            <AnimationType>0,0,0</AnimationType>
-          </Animation>
-          <IsDecorative>False</IsDecorative>
-          <IsFixed>False</IsFixed>
-          <IsMirrored>False</IsMirrored>
-          <Offset>0,0,0</Offset>
-          <Position>-5,8,-5</Position>
-          <Rotation>0,0,0</Rotation>
-          <Size>10,2,10</Size>
-          <TextureOffset>0,0</TextureOffset>
-        </Shape>
-        <Shape type="d9e621f7-957f-4b77-b1ae-20dcd0da7751" name="centerBase">
-          <Animation>
-            <AnimationAngles>0,0,0</AnimationAngles>
-            <AnimationDuration>0,0,0</AnimationDuration>
-            <AnimationType>0,0,0</AnimationType>
-          </Animation>
-          <IsDecorative>False</IsDecorative>
-          <IsFixed>False</IsFixed>
-          <IsMirrored>False</IsMirrored>
-          <Offset>0,0,0</Offset>
-          <Position>-5,22,-5</Position>
-          <Rotation>0,0,0</Rotation>
-          <Size>10,2,10</Size>
-          <TextureOffset>0,12</TextureOffset>
-        </Shape>
-        <Shape type="d9e621f7-957f-4b77-b1ae-20dcd0da7751" name="centerPoll">
-          <Animation>
-            <AnimationAngles>0,0,0</AnimationAngles>
-            <AnimationDuration>0,0,0</AnimationDuration>
-            <AnimationType>0,0,0</AnimationType>
-          </Animation>
-          <IsDecorative>False</IsDecorative>
-          <IsFixed>False</IsFixed>
-          <IsMirrored>False</IsMirrored>
-          <Offset>0,0,0</Offset>
-          <Position>-2,9,-2</Position>
-          <Rotation>0,0,0</Rotation>
-          <Size>4,14,4</Size>
-          <TextureOffset>0,24</TextureOffset>
-        </Shape>
-        <Shape type="d9e621f7-957f-4b77-b1ae-20dcd0da7751" name="mixerArm1">
-          <Animation>
-            <AnimationAngles>0,0,0</AnimationAngles>
-            <AnimationDuration>0,0,0</AnimationDuration>
-            <AnimationType>0,0,0</AnimationType>
-          </Animation>
-          <IsDecorative>False</IsDecorative>
-          <IsFixed>False</IsFixed>
-          <IsMirrored>False</IsMirrored>
-          <Offset>-21,0,-1</Offset>
-          <Position>0,20,0</Position>
-          <Rotation>0,0,0</Rotation>
-          <Size>42,2,2</Size>
-          <TextureOffset>0,44</TextureOffset>
-        </Shape>
-        <Shape type="d9e621f7-957f-4b77-b1ae-20dcd0da7751" name="mixerArm1Blade1">
-          <Animation>
-            <AnimationAngles>0,0,0</AnimationAngles>
-            <AnimationDuration>0,0,0</AnimationDuration>
-            <AnimationType>0,0,0</AnimationType>
-          </Animation>
-          <IsDecorative>False</IsDecorative>
-          <IsFixed>False</IsFixed>
-          <IsMirrored>False</IsMirrored>
-          <Offset>-20.5,1,-0.5</Offset>
-          <Position>0,20.5,0</Position>
-          <Rotation>35,0,0</Rotation>
-          <Size>10,2,1</Size>
-          <TextureOffset>16,24</TextureOffset>
-        </Shape>
-        <Shape type="d9e621f7-957f-4b77-b1ae-20dcd0da7751" name="mixerArm1Blade2">
-          <Animation>
-            <AnimationAngles>0,0,0</AnimationAngles>
-            <AnimationDuration>0,0,0</AnimationDuration>
-            <AnimationType>0,0,0</AnimationType>
-          </Animation>
-          <IsDecorative>False</IsDecorative>
-          <IsFixed>False</IsFixed>
-          <IsMirrored>False</IsMirrored>
-          <Offset>10.5,1,-0.5</Offset>
-          <Position>0,20.5,0</Position>
-          <Rotation>-35,0,0</Rotation>
-          <Size>10,2,1</Size>
-          <TextureOffset>16,24</TextureOffset>
-        </Shape>
-        <Shape type="d9e621f7-957f-4b77-b1ae-20dcd0da7751" name="mixerArm2">
-          <Animation>
-            <AnimationAngles>0,0,0</AnimationAngles>
-            <AnimationDuration>0,0,0</AnimationDuration>
-            <AnimationType>0,0,0</AnimationType>
-          </Animation>
-          <IsDecorative>False</IsDecorative>
-          <IsFixed>False</IsFixed>
-          <IsMirrored>False</IsMirrored>
-          <Offset>-1,0,-21</Offset>
-          <Position>0,13,0</Position>
-          <Rotation>0,0,0</Rotation>
-          <Size>2,2,42</Size>
-          <TextureOffset>0,0</TextureOffset>
-        </Shape>
-        <Shape type="d9e621f7-957f-4b77-b1ae-20dcd0da7751" name="mixerArm2Blade2">
-          <Animation>
-            <AnimationAngles>0,0,0</AnimationAngles>
-            <AnimationDuration>0,0,0</AnimationDuration>
-            <AnimationType>0,0,0</AnimationType>
-          </Animation>
-          <IsDecorative>False</IsDecorative>
-          <IsFixed>False</IsFixed>
-          <IsMirrored>False</IsMirrored>
-          <Offset>-0.5,1,10.5</Offset>
-          <Position>0,13.5,0</Position>
-          <Rotation>0,0,-35</Rotation>
-          <Size>1,2,10</Size>
-          <TextureOffset>16,27</TextureOffset>
-        </Shape>
-        <Shape type="d9e621f7-957f-4b77-b1ae-20dcd0da7751" name="mixerArm2Blade1">
-          <Animation>
-            <AnimationAngles>0,0,0</AnimationAngles>
-            <AnimationDuration>0,0,0</AnimationDuration>
-            <AnimationType>0,0,0</AnimationType>
-          </Animation>
-          <IsDecorative>False</IsDecorative>
-          <IsFixed>False</IsFixed>
-          <IsMirrored>False</IsMirrored>
-          <Offset>-0.5,1,-20.5</Offset>
-          <Position>0,13.5,0</Position>
-          <Rotation>0,0,35</Rotation>
-          <Size>1,2,10</Size>
-          <TextureOffset>16,27</TextureOffset>
-        </Shape>
-      </Geometry>
-      <GlScale>1,1,1</GlScale>
-      <Name>New</Name>
-      <TextureSize>128,64</TextureSize>
-    </Model>
-  </Models>
-  <Name>New</Name>
-  <PreviewImage></PreviewImage>
-  <ProjectName>New</ProjectName>
-  <ProjectType>Minecraft</ProjectType>
-</Techne>