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.
This commit is contained in:
Rseifert 2013-01-17 21:00:06 -05:00
parent c6e3320609
commit 3dd7fdada1
7 changed files with 166 additions and 281 deletions

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

View file

@ -8,169 +8,174 @@ import org.lwjgl.opengl.GL11;
public class ModelArmbot extends ModelBase public class ModelArmbot extends ModelBase
{ {
// fields // fields
ModelRenderer baseTop; ModelRenderer baseTop;
ModelRenderer base; ModelRenderer base;
ModelRenderer armMountRight; ModelRenderer armMountRight;
ModelRenderer armMountLeft; ModelRenderer armMountLeft;
ModelRenderer armLower; ModelRenderer armLower;
ModelRenderer armLower2; ModelRenderer armLower2;
ModelRenderer armLower3; ModelRenderer armLower3;
ModelRenderer armUpper; ModelRenderer armUpper;
ModelRenderer baseRotation; ModelRenderer baseRotation;
ModelRenderer clampBody; ModelRenderer clampBody;
ModelRenderer clampBody2; ModelRenderer clampBody2;
ModelRenderer clampClawLower; ModelRenderer clampClawLower;
ModelRenderer clampClawLower2; ModelRenderer clampClawLower2;
ModelRenderer clampClawLower3; ModelRenderer clampClawLower3;
public ModelArmbot() public ModelArmbot()
{ {
textureWidth = 128; textureWidth = 128;
textureHeight = 128; textureHeight = 128;
baseTop = new ModelRenderer(this, 0, 94); baseTop = new ModelRenderer(this, 0, 94);
baseTop.addBox(-6F, 0F, -6F, 12, 3, 12); baseTop.addBox(-6F, 0F, -6F, 12, 3, 12);
baseTop.setRotationPoint(0F, 18F, 0F); baseTop.setRotationPoint(0F, 18F, 0F);
baseTop.setTextureSize(64, 32); baseTop.setTextureSize(64, 32);
baseTop.mirror = true; baseTop.mirror = true;
setRotation(baseTop, 0F, 0F, 0F); setRotation(baseTop, 0F, 0F, 0F);
base = new ModelRenderer(this, 0, 109); base = new ModelRenderer(this, 0, 109);
base.addBox(-8F, 0F, -8F, 16, 3, 16); base.addBox(-8F, 0F, -8F, 16, 3, 16);
base.setRotationPoint(0F, 21F, 0F); base.setRotationPoint(0F, 21F, 0F);
base.setTextureSize(64, 32); base.setTextureSize(64, 32);
base.mirror = true; base.mirror = true;
setRotation(base, 0F, 0F, 0F); 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.setRotationPoint(0F, 17F, 0F);
armMountRight.setTextureSize(64, 32); armMountRight.setTextureSize(128, 128);
armMountRight.mirror = true; armMountRight.mirror = true;
setRotation(armMountRight, 0F, 0F, 0F); setRotation(armMountRight, 0F, 0F, 0F);
armMountLeft = new ModelRenderer(this, 0, 85); armMountLeft = new ModelRenderer(this, 0, 85);
armMountLeft.addBox(2F, -5F, -2F, 2, 5, 4); armMountLeft.addBox(2F, -5F, -2F, 2, 5, 4);
armMountLeft.setRotationPoint(0F, 17F, 0F); armMountLeft.setRotationPoint(0F, 17F, 0F);
armMountLeft.setTextureSize(64, 32); armMountLeft.setTextureSize(64, 32);
armMountLeft.mirror = true; armMountLeft.mirror = true;
setRotation(armMountLeft, 0F, 0F, 0F); setRotation(armMountLeft, 0F, 0F, 0F);
armLower = new ModelRenderer(this, 116, 0); armLower = new ModelRenderer(this, 116, 0);
armLower.addBox(0.3F, -15F, -1.5F, 2, 16, 4); armLower.addBox(0.3F, -15F, -1.5F, 2, 16, 4);
armLower.setRotationPoint(0F, 14F, 0F); armLower.setRotationPoint(0F, 14F, 0F);
armLower.setTextureSize(64, 32); armLower.setTextureSize(64, 32);
armLower.mirror = true; armLower.mirror = true;
setRotation(armLower, 0.5235988F, 0F, 0F); setRotation(armLower, 0.5235988F, 0F, 0F);
armLower2 = new ModelRenderer(this, 104, 0); armLower2 = new ModelRenderer(this, 104, 0);
armLower2.addBox(-2.3F, -15F, -1.5F, 2, 16, 4); armLower2.addBox(-2.3F, -15F, -1.5F, 2, 16, 4);
armLower2.setRotationPoint(0F, 14F, 0F); armLower2.setRotationPoint(0F, 14F, 0F);
armLower2.setTextureSize(64, 32); armLower2.setTextureSize(64, 32);
armLower2.mirror = true; armLower2.mirror = true;
setRotation(armLower2, 0.5235988F, 0F, 0F); setRotation(armLower2, 0.5235988F, 0F, 0F);
armLower3 = new ModelRenderer(this, 92, 0); armLower3 = new ModelRenderer(this, 92, 0);
armLower3.addBox(-1F, -14F, -2F, 2, 14, 4); armLower3.addBox(-1F, -14F, -2F, 2, 14, 4);
armLower3.setRotationPoint(0F, 14F, 0F); armLower3.setRotationPoint(0F, 14F, 0F);
armLower3.setTextureSize(64, 32); armLower3.setTextureSize(64, 32);
armLower3.mirror = true; armLower3.mirror = true;
setRotation(armLower3, 0.5235988F, 0F, 0F); setRotation(armLower3, 0.5235988F, 0F, 0F);
armUpper = new ModelRenderer(this, 0, 70); armUpper = new ModelRenderer(this, 0, 70);
armUpper.addBox(-1F, -10F, -1.5F, 2, 12, 3); armUpper.addBox(-1F, -10F, -1.5F, 2, 12, 3);
armUpper.setRotationPoint(0F, 2F, -7F); armUpper.setRotationPoint(0F, 2F, -7F);
armUpper.setTextureSize(64, 32); armUpper.setTextureSize(64, 32);
armUpper.mirror = true; armUpper.mirror = true;
setRotation(armUpper, 2.513274F, 0F, 0F); setRotation(armUpper, 2.513274F, 0F, 0F);
baseRotation = new ModelRenderer(this, 0, 60); baseRotation = new ModelRenderer(this, 0, 60);
baseRotation.addBox(-4.5F, 0F, -4.5F, 9, 1, 9); baseRotation.addBox(-4.5F, 0F, -4.5F, 9, 1, 9);
baseRotation.setRotationPoint(0F, 17F, 0F); baseRotation.setRotationPoint(0F, 17F, 0F);
baseRotation.setTextureSize(64, 32); baseRotation.setTextureSize(64, 32);
baseRotation.mirror = true; baseRotation.mirror = true;
setRotation(baseRotation, 0F, 0F, 0F); setRotation(baseRotation, 0F, 0F, 0F);
clampBody = new ModelRenderer(this, 0, 7); clampBody = new ModelRenderer(this, 0, 7);
clampBody.addBox(-1.5F, -12F, -2.5F, 3, 2, 5); clampBody.addBox(-1.5F, -12F, -2.5F, 3, 2, 5);
clampBody.setRotationPoint(0F, 2F, -7F); clampBody.setRotationPoint(0F, 2F, -7F);
clampBody.setTextureSize(64, 32); clampBody.setTextureSize(64, 32);
clampBody.mirror = true; clampBody.mirror = true;
setRotation(clampBody, 2.513274F, 0F, 0F); setRotation(clampBody, 2.513274F, 0F, 0F);
clampBody2 = new ModelRenderer(this, 0, 56); clampBody2 = new ModelRenderer(this, 0, 56);
clampBody2.addBox(-1F, -14F, -1F, 2, 2, 2); clampBody2.addBox(-1F, -14F, -1F, 2, 2, 2);
clampBody2.setRotationPoint(0F, 2F, -7F); clampBody2.setRotationPoint(0F, 2F, -7F);
clampBody2.setTextureSize(64, 32); clampBody2.setTextureSize(64, 32);
clampBody2.mirror = true; clampBody2.mirror = true;
setRotation(clampBody2, 2.513274F, 0F, 0F); setRotation(clampBody2, 2.513274F, 0F, 0F);
clampClawLower = new ModelRenderer(this, 0, 25); clampClawLower = new ModelRenderer(this, 0, 25);
clampClawLower.addBox(-1F, -4F, -1F, 2, 5, 1); clampClawLower.addBox(-1F, -4F, -1F, 2, 5, 1);
clampClawLower.setRotationPoint(0F, 13F, -15F); clampClawLower.setRotationPoint(0F, 13F, -15F);
clampClawLower.setTextureSize(64, 32); clampClawLower.setTextureSize(64, 32);
clampClawLower.mirror = true; clampClawLower.mirror = true;
setRotation(clampClawLower, 2.9147F, 0F, 0F); setRotation(clampClawLower, 2.9147F, 0F, 0F);
clampClawLower2 = new ModelRenderer(this, 0, 31); clampClawLower2 = new ModelRenderer(this, 0, 31);
clampClawLower2.addBox(-1.2F, -3.5F, 0F, 1, 6, 1); clampClawLower2.addBox(-1.2F, -3.5F, 0F, 1, 6, 1);
clampClawLower2.setRotationPoint(0F, 14F, -16F); clampClawLower2.setRotationPoint(0F, 14F, -16F);
clampClawLower2.setTextureSize(64, 32); clampClawLower2.setTextureSize(64, 32);
clampClawLower2.mirror = true; clampClawLower2.mirror = true;
setRotation(clampClawLower2, 2.897247F, 0F, 0F); setRotation(clampClawLower2, 2.897247F, 0F, 0F);
clampClawLower3 = new ModelRenderer(this, 0, 0); clampClawLower3 = new ModelRenderer(this, 0, 0);
clampClawLower3.addBox(0.2F, -3.5F, 0F, 1, 6, 1); clampClawLower3.addBox(0.2F, -3.5F, 0F, 1, 6, 1);
clampClawLower3.setRotationPoint(0F, 14F, -16F); clampClawLower3.setRotationPoint(0F, 14F, -16F);
clampClawLower3.setTextureSize(64, 32); clampClawLower3.setTextureSize(64, 32);
clampClawLower3.mirror = true; clampClawLower3.mirror = true;
setRotation(clampClawLower3, 2.897247F, 0F, 0F); setRotation(clampClawLower3, 2.897247F, 0F, 0F);
} }
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
{ {
super.render(entity, f, f1, f2, f3, f4, f5); super.render(entity, f, f1, f2, f3, f4, f5);
this.setRotationAngles(f, f1, f2, f3, f4, f5, entity); this.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
this.render(f5, entity.rotationYaw, entity.rotationPitch); this.render(f5, entity.rotationYaw, entity.rotationPitch);
} }
public void render(float f5, float rotationYaw, float rotationPitch) public void render(float f5, float rotationYaw, float rotationPitch)
{ {
/* /*
* armMountRight.setRotationPoint(baseRotation.rotationPointX, armMountRight.rotationPointY, * armMountRight.setRotationPoint(baseRotation.rotationPointX,
* baseRotation.rotationPointX); armMountLeft.setRotationPoint(baseRotation.rotationPointX, * armMountRight.rotationPointY, baseRotation.rotationPointX);
* armMountLeft.rotationPointY, baseRotation.rotationPointX); * armMountLeft.setRotationPoint(baseRotation.rotationPointX,
* armLower.setRotationPoint(baseRotation.rotationPointX, armLower.rotationPointY, * armMountLeft.rotationPointY, baseRotation.rotationPointX);
* baseRotation.rotationPointX); armUpper.setRotationPoint(baseRotation.rotationPointX, * armLower.setRotationPoint(baseRotation.rotationPointX,
* armUpper.rotationPointY, baseRotation.rotationPointX); * armLower.rotationPointY, baseRotation.rotationPointX);
* baseRotation.setRotationPoint(baseRotation.rotationPointX, baseRotation.rotationPointY, * armUpper.setRotationPoint(baseRotation.rotationPointX,
* baseRotation.rotationPointX); clampBody.setRotationPoint(baseRotation.rotationPointX, * armUpper.rotationPointY, baseRotation.rotationPointX);
* clampBody.rotationPointY, baseRotation.rotationPointX); * baseRotation.setRotationPoint(baseRotation.rotationPointX,
* clampBody2.setRotationPoint(baseRotation.rotationPointX, clampBody2.rotationPointY, * baseRotation.rotationPointY, baseRotation.rotationPointX);
* baseRotation.rotationPointX); * clampBody.setRotationPoint(baseRotation.rotationPointX,
* clampClawLower.setRotationPoint(baseRotation.rotationPointX, * clampBody.rotationPointY, baseRotation.rotationPointX);
* clampClawLower.rotationPointY, baseRotation.rotationPointX); * clampBody2.setRotationPoint(baseRotation.rotationPointX,
* clampClawLower2.setRotationPoint(baseRotation.rotationPointX, * clampBody2.rotationPointY, baseRotation.rotationPointX);
* clampClawLower2.rotationPointY, baseRotation.rotationPointX); * clampClawLower.setRotationPoint(baseRotation.rotationPointX,
* * clampClawLower.rotationPointY, baseRotation.rotationPointX);
* armMountRight.rotateAngleY = armBot.rotationYaw; armMountLeft.rotateAngleY = * clampClawLower2.setRotationPoint(baseRotation.rotationPointX,
* armBot.rotationYaw; armLower.rotateAngleY = armBot.rotationYaw; armUpper.rotateAngleY = * clampClawLower2.rotationPointY, baseRotation.rotationPointX);
* armBot.rotationYaw; baseRotation.rotateAngleY = armBot.rotationYaw; *
* clampBody.rotateAngleY = armBot.rotationYaw; clampBody2.rotateAngleY = * armMountRight.rotateAngleY = armBot.rotationYaw;
* armBot.rotationYaw; clampClawLower.rotateAngleY = armBot.rotationYaw; * armMountLeft.rotateAngleY = armBot.rotationYaw; armLower.rotateAngleY
* clampClawLower2.rotateAngleY = armBot.rotationYaw; * = armBot.rotationYaw; armUpper.rotateAngleY = armBot.rotationYaw;
*/ * baseRotation.rotateAngleY = armBot.rotationYaw;
* clampBody.rotateAngleY = armBot.rotationYaw; clampBody2.rotateAngleY
* = armBot.rotationYaw; clampClawLower.rotateAngleY =
* armBot.rotationYaw; clampClawLower2.rotateAngleY =
* armBot.rotationYaw;
*/
baseTop.render(f5); baseTop.render(f5);
base.render(f5); base.render(f5);
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glRotatef(rotationYaw, 0, 1, 0); GL11.glRotatef(rotationYaw, 0, 1, 0);
armMountRight.render(f5); armMountRight.render(f5);
armMountLeft.render(f5); armMountLeft.render(f5);
armLower.render(f5); armLower.render(f5);
armUpper.render(f5); armUpper.render(f5);
baseRotation.render(f5); baseRotation.render(f5);
clampBody.render(f5); clampBody.render(f5);
clampBody2.render(f5); clampBody2.render(f5);
clampClawLower.render(f5); clampClawLower.render(f5);
clampClawLower2.render(f5); clampClawLower2.render(f5);
GL11.glPopMatrix(); GL11.glPopMatrix();
} }
private void setRotation(ModelRenderer model, float x, float y, float z) private void setRotation(ModelRenderer model, float x, float y, float z)
{ {
model.rotateAngleX = x; model.rotateAngleX = x;
model.rotateAngleY = y; model.rotateAngleY = y;
model.rotateAngleZ = z; model.rotateAngleZ = z;
} }
} }

View file

@ -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;
}
}

View file

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

View file

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