From ba8feb526da0a1ce15a179e1e5ee44582f769768 Mon Sep 17 00:00:00 2001 From: Lance5057 Date: Fri, 18 Mar 2016 06:14:33 -0500 Subject: Added modifiers, beautified code --- .../tDefense/models/ModelJewelersBench.java | 176 +++++++++++---------- .../tDefense/models/Renderer_JewelersBench.java | 45 +++--- 2 files changed, 113 insertions(+), 108 deletions(-) (limited to 'src/main/java/lance5057/tDefense/models') diff --git a/src/main/java/lance5057/tDefense/models/ModelJewelersBench.java b/src/main/java/lance5057/tDefense/models/ModelJewelersBench.java index 827f232..342b747 100644 --- a/src/main/java/lance5057/tDefense/models/ModelJewelersBench.java +++ b/src/main/java/lance5057/tDefense/models/ModelJewelersBench.java @@ -8,93 +8,97 @@ import net.minecraft.entity.Entity; * JewelersBench - lance5057 * Created using Tabula 4.1.1 */ -public class ModelJewelersBench extends ModelBase { - public ModelRenderer TableSide2; - public ModelRenderer SawBlock1; - public ModelRenderer SawBlock2; - public ModelRenderer SawBlock3; - public ModelRenderer SawBlockClamp; - public ModelRenderer Leg1; - public ModelRenderer Leg2; - public ModelRenderer Leg3; - public ModelRenderer Leg4; - public ModelRenderer TableTop; - public ModelRenderer TableBack; - public ModelRenderer TableSide1; - public ModelRenderer Drawer; - public ModelRenderer Handle; +public class ModelJewelersBench extends ModelBase +{ + public ModelRenderer TableSide2; + public ModelRenderer SawBlock1; + public ModelRenderer SawBlock2; + public ModelRenderer SawBlock3; + public ModelRenderer SawBlockClamp; + public ModelRenderer Leg1; + public ModelRenderer Leg2; + public ModelRenderer Leg3; + public ModelRenderer Leg4; + public ModelRenderer TableTop; + public ModelRenderer TableBack; + public ModelRenderer TableSide1; + public ModelRenderer Drawer; + public ModelRenderer Handle; - public ModelJewelersBench() { - this.textureWidth = 64; - this.textureHeight = 64; - this.SawBlock1 = new ModelRenderer(this, 0, 0); - this.SawBlock1.setRotationPoint(2.0F, 8.2F, -12.0F); - this.SawBlock1.addBox(0.0F, 0.0F, 0.0F, 1, 1, 4, 0.0F); - this.Leg4 = new ModelRenderer(this, 0, 0); - this.Leg4.setRotationPoint(6.0F, 10.0F, 6.0F); - this.Leg4.addBox(0.0F, 0.0F, 0.0F, 2, 14, 2, 0.0F); - this.Drawer = new ModelRenderer(this, 0, 46); - this.Drawer.setRotationPoint(-6.0F, 11.5F, -8.0F); - this.Drawer.addBox(0.0F, 0.0F, 0.0F, 12, 2, 16, 0.0F); - this.TableSide2 = new ModelRenderer(this, 0, 0); - this.TableSide2.setRotationPoint(-8.0F, 7.0F, -7.0F); - this.TableSide2.addBox(0.0F, 0.0F, 0.0F, 1, 1, 14, 0.0F); - this.Leg2 = new ModelRenderer(this, 0, 0); - this.Leg2.setRotationPoint(6.0F, 10.0F, -8.0F); - this.Leg2.addBox(0.0F, 0.0F, 0.0F, 2, 14, 2, 0.0F); - this.TableSide1 = new ModelRenderer(this, 0, 0); - this.TableSide1.setRotationPoint(7.0F, 7.0F, -7.0F); - this.TableSide1.addBox(0.0F, 0.0F, 0.0F, 1, 1, 14, 0.0F); - this.SawBlock3 = new ModelRenderer(this, 0, 0); - this.SawBlock3.setRotationPoint(3.0F, 8.2F, -11.0F); - this.SawBlock3.addBox(0.0F, 0.0F, 0.0F, 1, 1, 3, 0.0F); - this.Handle = new ModelRenderer(this, 55, 0); - this.Handle.setRotationPoint(-2.0F, 12.0F, -9.0F); - this.Handle.addBox(0.0F, 0.0F, 0.0F, 4, 1, 1, 0.0F); - this.Leg1 = new ModelRenderer(this, 0, 0); - this.Leg1.setRotationPoint(-8.0F, 10.0F, -8.0F); - this.Leg1.addBox(0.0F, 0.0F, 0.0F, 2, 14, 2, 0.0F); - this.TableTop = new ModelRenderer(this, 0, 28); - this.TableTop.setRotationPoint(-8.0F, 8.0F, -8.0F); - this.TableTop.addBox(0.0F, 0.0F, 0.0F, 16, 2, 16, 0.0F); - this.TableBack = new ModelRenderer(this, 0, 0); - this.TableBack.setRotationPoint(-8.0F, 7.0F, 7.0F); - this.TableBack.addBox(0.0F, 0.0F, 0.0F, 16, 1, 1, 0.0F); - this.SawBlockClamp = new ModelRenderer(this, 54, 0); - this.SawBlockClamp.setRotationPoint(1.5F, 8.0F, -9.0F); - this.SawBlockClamp.addBox(0.0F, 0.0F, 0.0F, 4, 2, 1, 0.0F); - this.Leg3 = new ModelRenderer(this, 0, 0); - this.Leg3.setRotationPoint(-8.0F, 10.0F, 6.0F); - this.Leg3.addBox(0.0F, 0.0F, 0.0F, 2, 14, 2, 0.0F); - this.SawBlock2 = new ModelRenderer(this, 0, 0); - this.SawBlock2.setRotationPoint(4.0F, 8.2F, -12.0F); - this.SawBlock2.addBox(0.0F, 0.0F, 0.0F, 1, 1, 4, 0.0F); - } + public ModelJewelersBench() + { + this.textureWidth = 64; + this.textureHeight = 64; + this.SawBlock1 = new ModelRenderer(this, 0, 0); + this.SawBlock1.setRotationPoint(2.0F, 8.2F, -12.0F); + this.SawBlock1.addBox(0.0F, 0.0F, 0.0F, 1, 1, 4, 0.0F); + this.Leg4 = new ModelRenderer(this, 0, 0); + this.Leg4.setRotationPoint(6.0F, 10.0F, 6.0F); + this.Leg4.addBox(0.0F, 0.0F, 0.0F, 2, 14, 2, 0.0F); + this.Drawer = new ModelRenderer(this, 0, 46); + this.Drawer.setRotationPoint(-6.0F, 11.5F, -8.0F); + this.Drawer.addBox(0.0F, 0.0F, 0.0F, 12, 2, 16, 0.0F); + this.TableSide2 = new ModelRenderer(this, 0, 0); + this.TableSide2.setRotationPoint(-8.0F, 7.0F, -7.0F); + this.TableSide2.addBox(0.0F, 0.0F, 0.0F, 1, 1, 14, 0.0F); + this.Leg2 = new ModelRenderer(this, 0, 0); + this.Leg2.setRotationPoint(6.0F, 10.0F, -8.0F); + this.Leg2.addBox(0.0F, 0.0F, 0.0F, 2, 14, 2, 0.0F); + this.TableSide1 = new ModelRenderer(this, 0, 0); + this.TableSide1.setRotationPoint(7.0F, 7.0F, -7.0F); + this.TableSide1.addBox(0.0F, 0.0F, 0.0F, 1, 1, 14, 0.0F); + this.SawBlock3 = new ModelRenderer(this, 0, 0); + this.SawBlock3.setRotationPoint(3.0F, 8.2F, -11.0F); + this.SawBlock3.addBox(0.0F, 0.0F, 0.0F, 1, 1, 3, 0.0F); + this.Handle = new ModelRenderer(this, 55, 0); + this.Handle.setRotationPoint(-2.0F, 12.0F, -9.0F); + this.Handle.addBox(0.0F, 0.0F, 0.0F, 4, 1, 1, 0.0F); + this.Leg1 = new ModelRenderer(this, 0, 0); + this.Leg1.setRotationPoint(-8.0F, 10.0F, -8.0F); + this.Leg1.addBox(0.0F, 0.0F, 0.0F, 2, 14, 2, 0.0F); + this.TableTop = new ModelRenderer(this, 0, 28); + this.TableTop.setRotationPoint(-8.0F, 8.0F, -8.0F); + this.TableTop.addBox(0.0F, 0.0F, 0.0F, 16, 2, 16, 0.0F); + this.TableBack = new ModelRenderer(this, 0, 0); + this.TableBack.setRotationPoint(-8.0F, 7.0F, 7.0F); + this.TableBack.addBox(0.0F, 0.0F, 0.0F, 16, 1, 1, 0.0F); + this.SawBlockClamp = new ModelRenderer(this, 54, 0); + this.SawBlockClamp.setRotationPoint(1.5F, 8.0F, -9.0F); + this.SawBlockClamp.addBox(0.0F, 0.0F, 0.0F, 4, 2, 1, 0.0F); + this.Leg3 = new ModelRenderer(this, 0, 0); + this.Leg3.setRotationPoint(-8.0F, 10.0F, 6.0F); + this.Leg3.addBox(0.0F, 0.0F, 0.0F, 2, 14, 2, 0.0F); + this.SawBlock2 = new ModelRenderer(this, 0, 0); + this.SawBlock2.setRotationPoint(4.0F, 8.2F, -12.0F); + this.SawBlock2.addBox(0.0F, 0.0F, 0.0F, 1, 1, 4, 0.0F); + } - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - this.SawBlock1.render(f5); - this.Leg4.render(f5); - this.Drawer.render(f5); - this.TableSide2.render(f5); - this.Leg2.render(f5); - this.TableSide1.render(f5); - this.SawBlock3.render(f5); - this.Handle.render(f5); - this.Leg1.render(f5); - this.TableTop.render(f5); - this.TableBack.render(f5); - this.SawBlockClamp.render(f5); - this.Leg3.render(f5); - this.SawBlock2.render(f5); - } + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + { + this.SawBlock1.render(f5); + this.Leg4.render(f5); + this.Drawer.render(f5); + this.TableSide2.render(f5); + this.Leg2.render(f5); + this.TableSide1.render(f5); + this.SawBlock3.render(f5); + this.Handle.render(f5); + this.Leg1.render(f5); + this.TableTop.render(f5); + this.TableBack.render(f5); + this.SawBlockClamp.render(f5); + this.Leg3.render(f5); + this.SawBlock2.render(f5); + } - /** - * This is a helper function from Tabula to set the rotation of model parts - */ - public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } + /** + * This is a helper function from Tabula to set the rotation of model parts + */ + public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) + { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } } diff --git a/src/main/java/lance5057/tDefense/models/Renderer_JewelersBench.java b/src/main/java/lance5057/tDefense/models/Renderer_JewelersBench.java index 3406cea..bebba3e 100644 --- a/src/main/java/lance5057/tDefense/models/Renderer_JewelersBench.java +++ b/src/main/java/lance5057/tDefense/models/Renderer_JewelersBench.java @@ -10,32 +10,33 @@ import org.lwjgl.opengl.GL11; public class Renderer_JewelersBench extends TileEntitySpecialRenderer { - private final ModelJewelersBench model; - - public Renderer_JewelersBench() { - this.model = new ModelJewelersBench(); -} - + private final ModelJewelersBench model; + + public Renderer_JewelersBench() + { + this.model = new ModelJewelersBench(); + } + @Override public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale) { GL11.glPushMatrix(); - GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); - - ResourceLocation textures = (new ResourceLocation("tinkersdefense:textures/blocks/JewelersBench.png")); - - Minecraft.getMinecraft().renderEngine.bindTexture(textures); - - GL11.glPushMatrix(); - - int meta = te.getBlockMetadata(); - - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - - this.model.render((Entity)null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - GL11.glPopMatrix(); - + GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); + + ResourceLocation textures = (new ResourceLocation("tinkersdefense:textures/blocks/JewelersBench.png")); + + Minecraft.getMinecraft().renderEngine.bindTexture(textures); + + GL11.glPushMatrix(); + + int meta = te.getBlockMetadata(); + + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + + this.model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); + GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } -- cgit v1.2.3