diff --git a/.gitignore b/.gitignore index 49ec8582..afa6ceb5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.bat *.sh +*.db /*/ LICENSE.txt CHANGELOG diff --git a/resources/assemblyline/textures/Grey64.png b/resources/assemblyline/textures/Grey64.png deleted file mode 100644 index 999e6c05..00000000 Binary files a/resources/assemblyline/textures/Grey64.png and /dev/null differ diff --git a/resources/assemblyline/textures/dropbox.png b/resources/assemblyline/textures/dropbox.png deleted file mode 100644 index 02f2d965..00000000 Binary files a/resources/assemblyline/textures/dropbox.png and /dev/null differ diff --git a/resources/assemblyline/textures/ejector.png b/resources/assemblyline/textures/ejector.png deleted file mode 100644 index feba2e00..00000000 Binary files a/resources/assemblyline/textures/ejector.png and /dev/null differ diff --git a/models/Ejector.png b/resources/assemblyline/textures/rejector.png similarity index 100% rename from models/Ejector.png rename to resources/assemblyline/textures/rejector.png diff --git a/resources/assemblyline/textures/sorter.png b/resources/assemblyline/textures/sorter.png deleted file mode 100644 index feba2e00..00000000 Binary files a/resources/assemblyline/textures/sorter.png and /dev/null differ diff --git a/src/minecraft/assemblyline/client/model/ModelRejectorPiston.java b/src/minecraft/assemblyline/client/model/ModelRejectorPiston.java new file mode 100644 index 00000000..bc0381af --- /dev/null +++ b/src/minecraft/assemblyline/client/model/ModelRejectorPiston.java @@ -0,0 +1,170 @@ +// Date: 1/17/2013 8:14:56 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; +import net.minecraft.entity.Entity; + +public class ModelRejectorPiston extends ModelBase +{ + // fields + ModelRenderer BodyBottom; + ModelRenderer PistonFace2; + ModelRenderer PistonShaft; + ModelRenderer Piston; + ModelRenderer H1; + ModelRenderer H2; + ModelRenderer H3; + ModelRenderer PistonFace; + ModelRenderer WireCCRight; + ModelRenderer WireCCLeft; + ModelRenderer BodyP2; + ModelRenderer BodyP1; + ModelRenderer LeftSide; + ModelRenderer RightSide; + ModelRenderer PistonBack; + ModelRenderer WireCCFront; + + public ModelRejectorPiston() + { + textureWidth = 128; + textureHeight = 128; + + BodyBottom = new ModelRenderer(this, 29, 69); + BodyBottom.addBox(-5F, 0F, -2F, 10, 5, 15); + BodyBottom.setRotationPoint(0F, 19F, -6F); + BodyBottom.setTextureSize(128, 128); + BodyBottom.mirror = true; + setRotation(BodyBottom, 0F, 0F, 0F); + PistonFace2 = new ModelRenderer(this, 0, 53); + PistonFace2.addBox(-2F, -2F, -1F, 4, 6, 1); + PistonFace2.setRotationPoint(0F, 15F, -6F); + PistonFace2.setTextureSize(128, 128); + PistonFace2.mirror = true; + setRotation(PistonFace2, 0F, 0F, 0F); + PistonShaft = new ModelRenderer(this, 0, 75); + PistonShaft.addBox(-1.5F, -1.5F, 0F, 3, 3, 10); + PistonShaft.setRotationPoint(0F, 16F, -6F); + PistonShaft.setTextureSize(128, 128); + PistonShaft.mirror = true; + setRotation(PistonShaft, 0F, 0F, 0F); + Piston = new ModelRenderer(this, 0, 22); + Piston.addBox(-3F, -1F, 0F, 6, 6, 10); + Piston.setRotationPoint(0F, 14F, -5F); + Piston.setTextureSize(128, 128); + Piston.mirror = true; + setRotation(Piston, 0F, 0F, 0F); + H1 = new ModelRenderer(this, 33, 23); + H1.addBox(-1.5F, 0F, 0F, 3, 1, 8); + H1.setRotationPoint(0F, 12F, -4F); + H1.setTextureSize(128, 128); + H1.mirror = true; + setRotation(H1, 0F, 0F, 0F); + H2 = new ModelRenderer(this, 90, 23); + H2.addBox(0F, -1.5F, 0F, 1, 3, 8); + H2.setRotationPoint(-4F, 16F, -4F); + H2.setTextureSize(128, 128); + H2.mirror = true; + setRotation(H2, 0F, 0F, 0F); + H3 = new ModelRenderer(this, 70, 23); + H3.addBox(0F, -1.5F, 0F, 1, 3, 8); + H3.setRotationPoint(3F, 16F, -4F); + H3.setTextureSize(128, 128); + H3.mirror = true; + setRotation(H3, 0F, 0F, 0F); + PistonFace = new ModelRenderer(this, 0, 62); + PistonFace.addBox(-3F, -2F, -1F, 6, 4, 1); + PistonFace.setRotationPoint(0F, 16F, -6F); + PistonFace.setTextureSize(128, 128); + PistonFace.mirror = true; + setRotation(PistonFace, 0F, 0F, 0F); + WireCCRight = new ModelRenderer(this, 69, 52); + WireCCRight.addBox(-3F, -3F, 0F, 6, 11, 1); + WireCCRight.setRotationPoint(0F, 16F, 7F); + WireCCRight.setTextureSize(128, 128); + WireCCRight.mirror = true; + setRotation(WireCCRight, 0F, 0F, 0F); + WireCCLeft = new ModelRenderer(this, 54, 37); + WireCCLeft.addBox(0F, -3F, -3F, 1, 8, 6); + WireCCLeft.setRotationPoint(7F, 16F, 0F); + WireCCLeft.setTextureSize(128, 128); + WireCCLeft.mirror = true; + setRotation(WireCCLeft, 0F, 0F, 0F); + BodyP2 = new ModelRenderer(this, 100, 60); + BodyP2.addBox(1F, -2F, -2F, 2, 7, 4); + BodyP2.setRotationPoint(-8F, 16F, 0F); + BodyP2.setTextureSize(128, 128); + BodyP2.mirror = true; + setRotation(BodyP2, 0F, 0F, 0F); + BodyP1 = new ModelRenderer(this, 87, 60); + BodyP1.addBox(3F, -2F, -2F, 2, 7, 4); + BodyP1.setRotationPoint(2F, 16F, 0F); + BodyP1.setTextureSize(128, 128); + BodyP1.mirror = true; + setRotation(BodyP1, 0F, 0F, 0F); + LeftSide = new ModelRenderer(this, 29, 91); + LeftSide.addBox(0F, 0F, -2F, 3, 3, 14); + LeftSide.setRotationPoint(5F, 21F, -5F); + LeftSide.setTextureSize(128, 128); + LeftSide.mirror = true; + setRotation(LeftSide, 0F, 0F, 0F); + RightSide = new ModelRenderer(this, 64, 91); + RightSide.addBox(0F, 0F, -2F, 3, 3, 14); + RightSide.setRotationPoint(-8F, 21F, -5F); + RightSide.setTextureSize(128, 128); + RightSide.mirror = true; + setRotation(RightSide, 0F, 0F, 0F); + PistonBack = new ModelRenderer(this, 0, 12); + PistonBack.addBox(-2.5F, -2.5F, -1F, 5, 5, 2); + PistonBack.setRotationPoint(0F, 16F, 6F); + PistonBack.setTextureSize(128, 128); + PistonBack.mirror = true; + setRotation(PistonBack, 0F, 0F, 0F); + WireCCFront = new ModelRenderer(this, 69, 37); + WireCCFront.addBox(0F, -3F, -3F, 1, 8, 6); + WireCCFront.setRotationPoint(-8F, 16F, 0F); + WireCCFront.setTextureSize(128, 128); + WireCCFront.mirror = true; + setRotation(WireCCFront, 0F, 0F, 0F); + } + + public void render(float f5) + { + BodyBottom.render(f5); + Piston.render(f5); + H1.render(f5); + H2.render(f5); + H3.render(f5); + WireCCRight.render(f5); + WireCCLeft.render(f5); + BodyP2.render(f5); + BodyP1.render(f5); + LeftSide.render(f5); + RightSide.render(f5); + PistonBack.render(f5); + WireCCFront.render(f5); + } + + public void renderPiston(float f5, int p) + { + PistonFace2.setRotationPoint(0F, 15F, -6F-p); + PistonShaft.setRotationPoint(0F, 16F, -6F-p); + PistonFace.setRotationPoint(0F, 16F, -6F-p); + PistonFace2.render(f5); + 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; + } + +} diff --git a/src/minecraft/assemblyline/client/render/RenderRejector.java b/src/minecraft/assemblyline/client/render/RenderRejector.java index 787b58a8..b1b12f79 100644 --- a/src/minecraft/assemblyline/client/render/RenderRejector.java +++ b/src/minecraft/assemblyline/client/render/RenderRejector.java @@ -5,12 +5,13 @@ 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; public class RenderRejector extends RenderImprintable { - private ModelRejector model = new ModelRejector(); + private ModelRejectorPiston model = new ModelRejectorPiston(); private void renderAModelAt(TileEntityRejector tileEntity, double x, double y, double z, float f) { @@ -22,7 +23,7 @@ public class RenderRejector extends RenderImprintable { pos = 8; } - bindTextureByName(AssemblyLine.TEXTURE_PATH + "sorter.png"); + bindTextureByName(AssemblyLine.TEXTURE_PATH + "rejector.png"); GL11.glPushMatrix(); GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); GL11.glScalef(1.0F, -1F, -1F); @@ -42,7 +43,7 @@ public class RenderRejector extends RenderImprintable { GL11.glRotatef(270f, 0f, 1f, 0f); } - model.renderMain(0.0625F); + model.render(0.0625F); model.renderPiston(0.0625F, pos); GL11.glPopMatrix(); }