Changed item render for rejector

Change out the item render for the rejector block. Also corrected a
minor model issue with the robotic arm but nothing major changed with
it.

src/minecraft/assemblyline/client/model/ModelArmbot.java

@@ -41,10 +41,10 @@ public class ModelArmbot extends ModelBase
         base.setTextureSize(64, 32);
         base.mirror = true;
         setRotation(base, 0F, 0F, 0F);
-		armMountRight = new ModelRenderer(this, 12, 85);
+        armMountRight = new ModelRenderer(this, 24, 85);
-		armMountRight.addBox(-4F, -5F, -2F, 2, 5, 4);
+        armMountRight.addBox(-3.8F, -5F, -2F, 4, 5, 4);
         armMountRight.setRotationPoint(0F, 17F, 0F);
-		armMountRight.setTextureSize(64, 32);
+        armMountRight.setTextureSize(128, 128);
         armMountRight.mirror = true;
         setRotation(armMountRight, 0F, 0F, 0F);
         armMountLeft = new ModelRenderer(this, 0, 85);
@@ -126,28 +126,33 @@ public class ModelArmbot extends ModelBase
     {
 
         /*
-		 * armMountRight.setRotationPoint(baseRotation.rotationPointX, armMountRight.rotationPointY,
+         * armMountRight.setRotationPoint(baseRotation.rotationPointX,
-		 * baseRotation.rotationPointX); armMountLeft.setRotationPoint(baseRotation.rotationPointX,
+         * armMountRight.rotationPointY, baseRotation.rotationPointX);
+         * armMountLeft.setRotationPoint(baseRotation.rotationPointX,
          * armMountLeft.rotationPointY, baseRotation.rotationPointX);
-		 * armLower.setRotationPoint(baseRotation.rotationPointX, armLower.rotationPointY,
+         * armLower.setRotationPoint(baseRotation.rotationPointX,
-		 * baseRotation.rotationPointX); armUpper.setRotationPoint(baseRotation.rotationPointX,
+         * armLower.rotationPointY, baseRotation.rotationPointX);
+         * armUpper.setRotationPoint(baseRotation.rotationPointX,
          * armUpper.rotationPointY, baseRotation.rotationPointX);
-		 * baseRotation.setRotationPoint(baseRotation.rotationPointX, baseRotation.rotationPointY,
+         * baseRotation.setRotationPoint(baseRotation.rotationPointX,
-		 * baseRotation.rotationPointX); clampBody.setRotationPoint(baseRotation.rotationPointX,
+         * baseRotation.rotationPointY, baseRotation.rotationPointX);
+         * clampBody.setRotationPoint(baseRotation.rotationPointX,
          * clampBody.rotationPointY, baseRotation.rotationPointX);
-		 * clampBody2.setRotationPoint(baseRotation.rotationPointX, clampBody2.rotationPointY,
+         * clampBody2.setRotationPoint(baseRotation.rotationPointX,
-		 * baseRotation.rotationPointX);
+         * clampBody2.rotationPointY, baseRotation.rotationPointX);
          * clampClawLower.setRotationPoint(baseRotation.rotationPointX,
          * clampClawLower.rotationPointY, baseRotation.rotationPointX);
          * clampClawLower2.setRotationPoint(baseRotation.rotationPointX,
          * clampClawLower2.rotationPointY, baseRotation.rotationPointX);
          * 
-		 * armMountRight.rotateAngleY = armBot.rotationYaw; armMountLeft.rotateAngleY =
+         * armMountRight.rotateAngleY = armBot.rotationYaw;
-		 * armBot.rotationYaw; armLower.rotateAngleY = armBot.rotationYaw; armUpper.rotateAngleY =
+         * armMountLeft.rotateAngleY = armBot.rotationYaw; armLower.rotateAngleY
-		 * armBot.rotationYaw; baseRotation.rotateAngleY = armBot.rotationYaw;
+         * = armBot.rotationYaw; armUpper.rotateAngleY = armBot.rotationYaw;
-		 * clampBody.rotateAngleY = armBot.rotationYaw; clampBody2.rotateAngleY =
+         * baseRotation.rotateAngleY = armBot.rotationYaw;
-		 * armBot.rotationYaw; clampClawLower.rotateAngleY = armBot.rotationYaw;
+         * clampBody.rotateAngleY = armBot.rotationYaw; clampBody2.rotateAngleY
-		 * clampClawLower2.rotateAngleY = armBot.rotationYaw;
+         * = armBot.rotationYaw; clampClawLower.rotateAngleY =
+         * armBot.rotationYaw; clampClawLower2.rotateAngleY =
+         * armBot.rotationYaw;
          */
 
         baseTop.render(f5);

src/minecraft/assemblyline/client/model/ModelRejector.java

@@ -1,119 +0,0 @@
-// Date: 9/8/2012 7:10:46 PM
-// Template version 1.1
-// Java generated by Techne
-// Keep in mind that you still need to fill in some blanks
-// - ZeuX
-
-package assemblyline.client.model;
-
-import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.model.ModelRenderer;
-
-public class ModelRejector extends ModelBase
-{
-	// fields
-	ModelRenderer Base;
-	ModelRenderer Case;
-	ModelRenderer Piston;
-	ModelRenderer H1;
-	ModelRenderer H2;
-	ModelRenderer Top;
-	ModelRenderer Case2;
-	ModelRenderer H3;
-	ModelRenderer PistonShaft;
-	ModelRenderer PistonFace;
-
-	public ModelRejector()
-	{
-		textureWidth = 128;
-		textureHeight = 128;
-
-		Base = new ModelRenderer(this, 64, 0);
-		Base.addBox(-8F, 0F, -8F, 16, 4, 16);
-		Base.setRotationPoint(0F, 20F, 0F);
-		Base.setTextureSize(64, 32);
-		Base.mirror = true;
-		setRotation(Base, 0F, 0F, 0F);
-		Case = new ModelRenderer(this, 0, 38);
-		Case.addBox(-2F, 0F, 0F, 4, 8, 13);
-		Case.setRotationPoint(-5F, 12F, -6F);
-		Case.setTextureSize(64, 32);
-		Case.mirror = true;
-		setRotation(Case, 0F, 0F, 0F);
-		Piston = new ModelRenderer(this, 0, 22);
-		Piston.addBox(-2F, 0F, 0F, 4, 4, 10);
-		Piston.setRotationPoint(0F, 15F, -5F);
-		Piston.setTextureSize(64, 32);
-		Piston.mirror = true;
-		setRotation(Piston, 0F, 0F, 0F);
-		H1 = new ModelRenderer(this, 29, 23);
-		H1.addBox(-2F, 0F, 0F, 2, 1, 8);
-		H1.setRotationPoint(1F, 19F, -4F);
-		H1.setTextureSize(64, 32);
-		H1.mirror = true;
-		setRotation(H1, 0F, 0F, 0F);
-		H2 = new ModelRenderer(this, 54, 23);
-		H2.addBox(-2F, 0F, 0F, 1, 2, 8);
-		H2.setRotationPoint(-1F, 16F, -4F);
-		H2.setTextureSize(64, 32);
-		H2.mirror = true;
-		setRotation(H2, 0F, 0F, 0F);
-		Top = new ModelRenderer(this, 0, 0);
-		Top.addBox(-8F, 0F, -8F, 16, 4, 16);
-		Top.setRotationPoint(0F, 8F, 0F);
-		Top.setTextureSize(64, 32);
-		Top.mirror = true;
-		setRotation(Top, 0F, 0F, 0F);
-		Case2 = new ModelRenderer(this, 0, 38);
-		Case2.addBox(-2F, 0F, 0F, 4, 8, 13);
-		Case2.setRotationPoint(5F, 12F, -6F);
-		Case2.setTextureSize(64, 32);
-		Case2.mirror = true;
-		setRotation(Case2, 0F, 0F, 0F);
-		H3 = new ModelRenderer(this, 54, 23);
-		H3.addBox(-2F, 0F, 0F, 1, 2, 8);
-		H3.setRotationPoint(4F, 16F, -4F);
-		H3.setTextureSize(64, 32);
-		H3.mirror = true;
-		setRotation(H3, 0F, 0F, 0F);
-		PistonShaft = new ModelRenderer(this, 0, 67);
-		PistonShaft.addBox(-1F, -1F, 0F, 2, 2, 10);
-		PistonShaft.setRotationPoint(0F, 17F, -6F);
-		PistonShaft.setTextureSize(64, 32);
-		PistonShaft.mirror = true;
-		setRotation(PistonShaft, 0F, 0F, 0F);
-		PistonFace = new ModelRenderer(this, 0, 62);
-		PistonFace.addBox(-3F, -1F, -1F, 6, 2, 1);
-		PistonFace.setRotationPoint(0F, 17F, -6F);
-		PistonFace.setTextureSize(64, 32);
-		PistonFace.mirror = true;
-		setRotation(PistonFace, 0F, 0F, 0F);
-	}
-
-	public void renderMain(float f5)
-	{
-		Base.render(f5);
-		Case.render(f5);
-		H1.render(f5);
-		H2.render(f5);
-		Top.render(f5);
-		Case2.render(f5);
-		H3.render(f5);
-	}
-
-	public void renderPiston(float f5, int pos)
-	{
-		Piston.render(f5);
-		PistonShaft.setRotationPoint(0F, 17F, -6F - pos);
-		PistonFace.setRotationPoint(0F, 17F, -6F - pos);
-		PistonShaft.render(f5);
-		PistonFace.render(f5);
-	}
-
-	private void setRotation(ModelRenderer model, float x, float y, float z)
-	{
-		model.rotateAngleX = x;
-		model.rotateAngleY = y;
-		model.rotateAngleZ = z;
-	}
-}

src/minecraft/assemblyline/client/render/BlockRenderingHandler.java

@@ -9,7 +9,7 @@ import org.lwjgl.opengl.GL11;
 import universalelectricity.core.vector.Vector3;
 import assemblyline.client.model.ModelConveyorBelt;
 import assemblyline.client.model.ModelManipulator;
-import assemblyline.client.model.ModelRejector;
+import assemblyline.client.model.ModelRejectorPiston;
 import assemblyline.common.AssemblyLine;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@@ -23,7 +23,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
 	public static BlockRenderingHandler instance = new BlockRenderingHandler();
 	public static final int BLOCK_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
 	private ModelConveyorBelt modelConveyorBelt = new ModelConveyorBelt();
-	private ModelRejector modelEjector = new ModelRejector();
+	private ModelRejectorPiston modelEjector = new ModelRejectorPiston();
 	private ModelManipulator modelInjector = new ModelManipulator();
 
 	@Override
@@ -44,12 +44,12 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
 		}
 		else if (block.blockID == AssemblyLine.blockRejector.blockID)
 		{
-			GL11.glBindTexture(GL11.GL_TEXTURE_2D, FMLClientHandler.instance().getClient().renderEngine.getTexture(AssemblyLine.TEXTURE_PATH + "sorter.png"));
+			GL11.glBindTexture(GL11.GL_TEXTURE_2D, FMLClientHandler.instance().getClient().renderEngine.getTexture(AssemblyLine.TEXTURE_PATH + "rejector.png"));
 			GL11.glPushMatrix();
 			GL11.glTranslatef((float) 0.6F, (float) 1.5F, (float) 0.6F);
 			GL11.glRotatef(180f, 0f, 0f, 1f);
 			GL11.glRotatef(-90f, 0f, 1f, 0f);
-			modelEjector.renderMain(0.0625F);
+			modelEjector.render(0.0625F);
 			modelEjector.renderPiston(0.0625F, 1);
 			GL11.glPopMatrix();
 		}

src/minecraft/assemblyline/client/render/RenderRejector.java

@@ -4,7 +4,6 @@ import net.minecraft.tileentity.TileEntity;
 
 import org.lwjgl.opengl.GL11;
 
-import assemblyline.client.model.ModelRejector;
 import assemblyline.client.model.ModelRejectorPiston;
 import assemblyline.common.AssemblyLine;
 import assemblyline.common.machine.TileEntityRejector;