From 9a4d1e95ea7784f0f98ea2913701a3a3c28aefaa Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 24 May 2018 16:03:42 -0400 Subject: Formatting pass --- .../jewelrycraft/model/ItemStackModelRenderer.java | 25 ++++---- .../jewelrycraft/model/ModelBracelet.java | 67 ++++++++++++++------- .../jewelrycraft/model/ModelDisplayer.java | 4 +- .../jewelrycraft/model/ModelEarrings.java | 10 ++-- .../jewelrycraft/model/ModelHalfHeart.java | 21 ++++--- .../jewelrycraft/model/ModelHandPedestal.java | 61 +++++++++++-------- .../darkknight/jewelrycraft/model/ModelHeart.java | 28 +++++---- .../model/ModelJewlersCraftingBench.java | 4 +- .../darkknight/jewelrycraft/model/ModelMask.java | 4 +- .../darkknight/jewelrycraft/model/ModelMolder.java | 4 +- .../jewelrycraft/model/ModelNeckalce.java | 70 ++++++++++++++-------- .../darkknight/jewelrycraft/model/ModelRing.java | 46 +++++++++----- .../jewelrycraft/model/ModelShadowEye.java | 17 ++++-- .../jewelrycraft/model/ModelShadowHand.java | 9 ++- .../jewelrycraft/model/ModelSmelter.java | 4 +- 15 files changed, 230 insertions(+), 144 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/model') diff --git a/src/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java b/src/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java index 9a5539b..fe5a183 100755 --- a/src/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java +++ b/src/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java @@ -16,11 +16,11 @@ import net.minecraft.util.ResourceLocation; * @author Paul Fulham (pau101) */ public class ItemStackModelRenderer extends ModelRenderer { - private RenderItem renderItem; + private RenderItem renderItem; private TextureManager textureManager; private ResourceLocation resetResourceLocation; - private EntityItem entityItem; - private Minecraft mc; + private EntityItem entityItem; + private Minecraft mc; /** * @param modelBase @@ -31,8 +31,8 @@ public class ItemStackModelRenderer extends ModelRenderer { super(modelBase); renderItem = (RenderItem) RenderManager.instance.entityRenderMap .get(EntityItem.class); - textureManager = - (mc = Minecraft.getMinecraft()).getTextureManager(); + textureManager = (mc = Minecraft.getMinecraft()) + .getTextureManager(); this.resetResourceLocation = resetResourceLocation; } @@ -43,7 +43,8 @@ public class ItemStackModelRenderer extends ModelRenderer { if (itemStack == null || itemStack.getItem() == null) entityItem = null; else { - entityItem = new EntityItem(null, 0, 0, 0, itemStack); + entityItem = new EntityItem(null, 0, 0, 0, + itemStack); entityItem.hoverStart = 0; } } @@ -59,12 +60,16 @@ public class ItemStackModelRenderer extends ModelRenderer { GL11.glPushMatrix(); GL11.glTranslatef(offsetX, offsetY, offsetZ); GL11.glTranslatef(rotationPointX * scale, - rotationPointY * scale, rotationPointZ * scale); - GL11.glRotatef(rotateAngleZ * (180 / (float) Math.PI), 0, 0, + rotationPointY * scale, + rotationPointZ * scale); + GL11.glRotatef(rotateAngleZ + * (180 / (float) Math.PI), 0, 0, 1); - GL11.glRotatef(rotateAngleY * (180 / (float) Math.PI), 0, 1, + GL11.glRotatef(rotateAngleY + * (180 / (float) Math.PI), 0, 1, 0); - GL11.glRotatef(rotateAngleX * (180 / (float) Math.PI), 1, 0, + GL11.glRotatef(rotateAngleX + * (180 / (float) Math.PI), 1, 0, 0); boolean fancyGraphics = mc.gameSettings.fancyGraphics; mc.gameSettings.fancyGraphics = true; diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelBracelet.java b/src/main/java/darkknight/jewelrycraft/model/ModelBracelet.java index 08a092a..f63e4bf 100755 --- a/src/main/java/darkknight/jewelrycraft/model/ModelBracelet.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelBracelet.java @@ -33,7 +33,8 @@ public class ModelBracelet extends ModelBase { this.gem4 = new ModelRenderer(this, 0, 0); this.gem4.setRotationPoint(-3.0F, 12.8F, -3.5F); this.gem4.addBox(0.0F, 0.0F, 0.0F, 1, 1, 1, 0.0F); - this.setRotateAngle(gem4, 0.0F, 0.008901179185171082F, 0.0F); + this.setRotateAngle(gem4, 0.0F, 0.008901179185171082F, + 0.0F); this.gem3 = new ModelRenderer(this, 0, 0); this.gem3.setRotationPoint(-4.8F, 12.2F, -3.5F); this.gem3.addBox(0.0F, 0.0F, 0.0F, 1, 1, 1, 0.0F); @@ -78,7 +79,8 @@ public class ModelBracelet extends ModelBase { int red = (ingotColor >> 16) & 0xff; int green = (ingotColor >> 8) & 0xff; int blue = ingotColor & 0xff; - GL11.glColor3f((float) red / 255, (float) green / 255, + GL11.glColor3f((float) red / 255, + (float) green / 255, (float) blue / 255); this.metal1.render(f5); this.metal2.render(f5); @@ -90,19 +92,22 @@ public class ModelBracelet extends ModelBase { int red = gemColor >> 16 & 0xff; int green = gemColor >> 8 & 0xff; int blue = gemColor & 0xff; - GL11.glColor3f((float) red / 255, (float) green / 255, + GL11.glColor3f((float) red / 255, + (float) green / 255, (float) blue / 255); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE_MINUS_DST_COLOR); GL11.glPushMatrix(); - GL11.glTranslatef(this.gem4.offsetX, this.gem4.offsetY, + GL11.glTranslatef(this.gem4.offsetX, + this.gem4.offsetY, this.gem4.offsetZ); GL11.glTranslatef(this.gem4.rotationPointX * f5, this.gem4.rotationPointY * f5, this.gem4.rotationPointZ * f5); GL11.glScaled(0.5D, 0.5D, 0.5D); - GL11.glTranslatef(-this.gem4.offsetX, -this.gem4.offsetY, + GL11.glTranslatef(-this.gem4.offsetX, + -this.gem4.offsetY, -this.gem4.offsetZ); GL11.glTranslatef(-this.gem4.rotationPointX * f5, -this.gem4.rotationPointY * f5, @@ -110,13 +115,15 @@ public class ModelBracelet extends ModelBase { this.gem4.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.gem3.offsetX, this.gem3.offsetY, + GL11.glTranslatef(this.gem3.offsetX, + this.gem3.offsetY, this.gem3.offsetZ); GL11.glTranslatef(this.gem3.rotationPointX * f5, this.gem3.rotationPointY * f5, this.gem3.rotationPointZ * f5); GL11.glScaled(0.5D, 0.5D, 0.5D); - GL11.glTranslatef(-this.gem3.offsetX, -this.gem3.offsetY, + GL11.glTranslatef(-this.gem3.offsetX, + -this.gem3.offsetY, -this.gem3.offsetZ); GL11.glTranslatef(-this.gem3.rotationPointX * f5, -this.gem3.rotationPointY * f5, @@ -124,13 +131,15 @@ public class ModelBracelet extends ModelBase { this.gem3.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.gem2.offsetX, this.gem2.offsetY, + GL11.glTranslatef(this.gem2.offsetX, + this.gem2.offsetY, this.gem2.offsetZ); GL11.glTranslatef(this.gem2.rotationPointX * f5, this.gem2.rotationPointY * f5, this.gem2.rotationPointZ * f5); GL11.glScaled(0.5D, 0.5D, 0.5D); - GL11.glTranslatef(-this.gem2.offsetX, -this.gem2.offsetY, + GL11.glTranslatef(-this.gem2.offsetX, + -this.gem2.offsetY, -this.gem2.offsetZ); GL11.glTranslatef(-this.gem2.rotationPointX * f5, -this.gem2.rotationPointY * f5, @@ -138,13 +147,15 @@ public class ModelBracelet extends ModelBase { this.gem2.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.gem1.offsetX, this.gem1.offsetY, + GL11.glTranslatef(this.gem1.offsetX, + this.gem1.offsetY, this.gem1.offsetZ); GL11.glTranslatef(this.gem1.rotationPointX * f5, this.gem1.rotationPointY * f5, this.gem1.rotationPointZ * f5); GL11.glScaled(0.5D, 0.5D, 0.5D); - GL11.glTranslatef(-this.gem1.offsetX, -this.gem1.offsetY, + GL11.glTranslatef(-this.gem1.offsetX, + -this.gem1.offsetY, -this.gem1.offsetZ); GL11.glTranslatef(-this.gem1.rotationPointX * f5, -this.gem1.rotationPointY * f5, @@ -152,13 +163,15 @@ public class ModelBracelet extends ModelBase { this.gem1.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.gem6.offsetX, this.gem6.offsetY, + GL11.glTranslatef(this.gem6.offsetX, + this.gem6.offsetY, this.gem6.offsetZ); GL11.glTranslatef(this.gem6.rotationPointX * f5, this.gem6.rotationPointY * f5, this.gem6.rotationPointZ * f5); GL11.glScaled(0.5D, 0.5D, 0.5D); - GL11.glTranslatef(-this.gem6.offsetX, -this.gem6.offsetY, + GL11.glTranslatef(-this.gem6.offsetX, + -this.gem6.offsetY, -this.gem6.offsetZ); GL11.glTranslatef(-this.gem6.rotationPointX * f5, -this.gem6.rotationPointY * f5, @@ -166,13 +179,15 @@ public class ModelBracelet extends ModelBase { this.gem6.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.gem7.offsetX, this.gem7.offsetY, + GL11.glTranslatef(this.gem7.offsetX, + this.gem7.offsetY, this.gem7.offsetZ); GL11.glTranslatef(this.gem7.rotationPointX * f5, this.gem7.rotationPointY * f5, this.gem7.rotationPointZ * f5); GL11.glScaled(0.5D, 0.5D, 0.5D); - GL11.glTranslatef(-this.gem7.offsetX, -this.gem7.offsetY, + GL11.glTranslatef(-this.gem7.offsetX, + -this.gem7.offsetY, -this.gem7.offsetZ); GL11.glTranslatef(-this.gem7.rotationPointX * f5, -this.gem7.rotationPointY * f5, @@ -180,13 +195,15 @@ public class ModelBracelet extends ModelBase { this.gem7.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.gem8.offsetX, this.gem8.offsetY, + GL11.glTranslatef(this.gem8.offsetX, + this.gem8.offsetY, this.gem8.offsetZ); GL11.glTranslatef(this.gem8.rotationPointX * f5, this.gem8.rotationPointY * f5, this.gem8.rotationPointZ * f5); GL11.glScaled(0.5D, 0.5D, 0.5D); - GL11.glTranslatef(-this.gem8.offsetX, -this.gem8.offsetY, + GL11.glTranslatef(-this.gem8.offsetX, + -this.gem8.offsetY, -this.gem8.offsetZ); GL11.glTranslatef(-this.gem8.rotationPointX * f5, -this.gem8.rotationPointY * f5, @@ -194,13 +211,15 @@ public class ModelBracelet extends ModelBase { this.gem8.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.gem5.offsetX, this.gem5.offsetY, + GL11.glTranslatef(this.gem5.offsetX, + this.gem5.offsetY, this.gem5.offsetZ); GL11.glTranslatef(this.gem5.rotationPointX * f5, this.gem5.rotationPointY * f5, this.gem5.rotationPointZ * f5); GL11.glScaled(0.5D, 0.5D, 0.5D); - GL11.glTranslatef(-this.gem5.offsetX, -this.gem5.offsetY, + GL11.glTranslatef(-this.gem5.offsetX, + -this.gem5.offsetY, -this.gem5.offsetZ); GL11.glTranslatef(-this.gem5.rotationPointX * f5, -this.gem5.rotationPointY * f5, @@ -208,13 +227,15 @@ public class ModelBracelet extends ModelBase { this.gem5.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.gem9.offsetX, this.gem9.offsetY, + GL11.glTranslatef(this.gem9.offsetX, + this.gem9.offsetY, this.gem9.offsetZ); GL11.glTranslatef(this.gem9.rotationPointX * f5, this.gem9.rotationPointY * f5, this.gem9.rotationPointZ * f5); GL11.glScaled(0.5D, 0.5D, 0.5D); - GL11.glTranslatef(-this.gem9.offsetX, -this.gem9.offsetY, + GL11.glTranslatef(-this.gem9.offsetX, + -this.gem9.offsetY, -this.gem9.offsetZ); GL11.glTranslatef(-this.gem9.rotationPointX * f5, -this.gem9.rotationPointY * f5, @@ -227,8 +248,8 @@ public class ModelBracelet extends ModelBase { } /** - * This is a helper function from Tabula to set the rotation of model - * parts + * 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) { diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelDisplayer.java b/src/main/java/darkknight/jewelrycraft/model/ModelDisplayer.java index 2d7d986..4668ab8 100755 --- a/src/main/java/darkknight/jewelrycraft/model/ModelDisplayer.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelDisplayer.java @@ -257,8 +257,8 @@ public class ModelDisplayer extends ModelBase { * @param f4 * @param f5 */ - public void setRotationAngles(float f, float f1, float f2, float f3, - float f4, float f5) { + public void setRotationAngles(float f, float f1, float f2, + float f3, float f4, float f5) { super.setRotationAngles(f, f1, f2, f3, f4, f5, null); } } diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelEarrings.java b/src/main/java/darkknight/jewelrycraft/model/ModelEarrings.java index c6a067f..ed378e9 100755 --- a/src/main/java/darkknight/jewelrycraft/model/ModelEarrings.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelEarrings.java @@ -82,7 +82,8 @@ public class ModelEarrings extends ModelBase { int red = ingotColor >> 16 & 0xff; int green = ingotColor >> 8 & 0xff; int blue = ingotColor & 0xff; - GL11.glColor3f((float) red / 255, (float) green / 255, + GL11.glColor3f((float) red / 255, + (float) green / 255, (float) blue / 255); MetalPart00.render(f5); MetalPart10.render(f5); @@ -99,7 +100,8 @@ public class ModelEarrings extends ModelBase { int red = gemColor >> 16 & 0xff; int green = gemColor >> 8 & 0xff; int blue = gemColor & 0xff; - GL11.glColor3f((float) red / 255, (float) green / 255, + GL11.glColor3f((float) red / 255, + (float) green / 255, (float) blue / 255); Gem0.render(f5); Gem1.render(f5); @@ -116,8 +118,8 @@ public class ModelEarrings extends ModelBase { model.rotateAngleZ = z; } - public void setRotationAngles(float f, float f1, float f2, float f3, - float f4, float f5) { + public void setRotationAngles(float f, float f1, float f2, + float f3, float f4, float f5) { super.setRotationAngles(f, f1, f2, f3, f4, f5, null); } } diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelHalfHeart.java b/src/main/java/darkknight/jewelrycraft/model/ModelHalfHeart.java index ece8a2f..016bf02 100755 --- a/src/main/java/darkknight/jewelrycraft/model/ModelHalfHeart.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelHalfHeart.java @@ -11,12 +11,13 @@ import net.minecraft.entity.Entity; public class ModelHalfHeart extends ModelBase { // fields - ModelRenderer s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, - s14, s15, s16, s17, s18, s19, s20, s21, s22; + ModelRenderer s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, + s13, s14, s15, s16, s17, s18, s19, s20, s21, s22; ModelRenderer f1, f3, f4, f5, f6, f7, f8, f9, f13, f14, f16, f17, f19, f20, f21, f22, f23, f24, f25, f26; - ModelRenderer b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, b13, - b14, b15, b16, b19, b20, b21, b23, b24, b25, b26; + ModelRenderer b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, + b13, b14, b15, b16, b19, b20, b21, b23, b24, b25, + b26; public ModelHalfHeart() { textureWidth = 64; @@ -415,10 +416,12 @@ public class ModelHalfHeart extends ModelBase { @Override public void render(Entity entity, float angle1, float angle2, - float angle3, float angle4, float angle5, float angle6) { - super.render(entity, angle1, angle2, angle3, angle4, angle5, + float angle3, float angle4, float angle5, + float angle6) { + super.render(entity, angle1, angle2, angle3, angle4, + angle5, angle6); + setRotationAngles(angle1, angle2, angle3, angle4, angle5, angle6); - setRotationAngles(angle1, angle2, angle3, angle4, angle5, angle6); s1.render(angle6); s2.render(angle6); s3.render(angle6); @@ -493,8 +496,8 @@ public class ModelHalfHeart extends ModelBase { model.rotateAngleZ = z; } - public void setRotationAngles(float f, float f1, float f2, float f3, - float f4, float f5) { + public void setRotationAngles(float f, float f1, float f2, + float f3, float f4, float f5) { super.setRotationAngles(f, f1, f2, f3, f4, f5, null); } } diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelHandPedestal.java b/src/main/java/darkknight/jewelrycraft/model/ModelHandPedestal.java index 5163ad1..fc02886 100755 --- a/src/main/java/darkknight/jewelrycraft/model/ModelHandPedestal.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelHandPedestal.java @@ -15,14 +15,14 @@ import net.minecraft.util.ResourceLocation; * @author Paul Fulham (pau101) */ public class ModelHandPedestal extends ModelBase { - protected ModelRenderer plinth; - protected ModelRenderer base; - protected ModelRenderer shaft; - private ModelRenderer palm; - private ModelRenderer[] fingers; - private ModelRenderer thumb; + protected ModelRenderer plinth; + protected ModelRenderer base; + protected ModelRenderer shaft; + private ModelRenderer palm; + private ModelRenderer[] fingers; + private ModelRenderer thumb; private ItemStackModelRenderer heldItemStack; - private CubicBezier easeInOut; + private CubicBezier easeInOut; /** * @param resetResourceLocation @@ -40,9 +40,12 @@ public class ModelHandPedestal extends ModelBase { * */ protected void initPedestalRenderers() { - plinth = createModelRenderer(0, 0).addBox(-6, 4, -6, 12, 4, 12); - base = createModelRenderer(0, 0).addBox(-4, 0, -4, 8, 4, 8); - shaft = createModelRenderer(0, 0).addBox(-3, -4, -3, 6, 4, 6); + plinth = createModelRenderer(0, 0).addBox(-6, 4, -6, 12, 4, + 12); + base = createModelRenderer(0, 0).addBox(-4, 0, -4, 8, 4, + 8); + shaft = createModelRenderer(0, 0).addBox(-3, -4, -3, 6, 4, + 6); } /** @@ -57,10 +60,10 @@ public class ModelHandPedestal extends ModelBase { * @param textureOffsetY * @return */ - protected final ModelRenderer createModelRenderer(int textureOffsetX, - int textureOffsetY) { - ModelRenderer modelRenderer = - new ModelRenderer(this, textureOffsetX, textureOffsetY); + protected final ModelRenderer createModelRenderer( + int textureOffsetX, int textureOffsetY) { + ModelRenderer modelRenderer = new ModelRenderer(this, + textureOffsetX, textureOffsetY); modelRenderer.setTextureSize(textureWidth, textureHeight); return modelRenderer; } @@ -69,7 +72,8 @@ public class ModelHandPedestal extends ModelBase { * @return */ private ModelRenderer createPhalanges() { - return createModelRenderer(0, 0).addBox(-1, -1.5F, 0, 2, 3, 5) + return createModelRenderer(0, 0) + .addBox(-1, -1.5F, 0, 2, 3, 5) .addBox(-1, -5.5F, 2, 2, 4, 3); } @@ -78,17 +82,19 @@ public class ModelHandPedestal extends ModelBase { */ private void initHandModelRenderers( ResourceLocation resetResourceLocation) { - palm = createModelRenderer(0, 0).addBox(-4, -8, -4, 8, 4, 8); + palm = createModelRenderer(0, 0).addBox(-4, -8, -4, 8, 4, + 8); shaft.addChild(palm); int fingerCount = 4; fingers = new ModelRenderer[fingerCount]; for (int i = 0; i < fingerCount; i++) { ModelRenderer phalanges = createPhalanges(); - float theta = - (i / (float) fingerCount - 0.5F + 1F / fingerCount / 2) - * ((float) Math.PI * 0.6F); + float theta = (i / (float) fingerCount - 0.5F + + 1F / fingerCount / 2) + * ((float) Math.PI * 0.6F); phalanges.rotateAngleY = theta; - phalanges.setRotationPoint(MathHelper.sin(theta) * 5, -5.75F, + phalanges.setRotationPoint( + MathHelper.sin(theta) * 5, -5.75F, MathHelper.cos(theta) * 5 - 1); fingers[i] = phalanges; palm.addChild(phalanges); @@ -98,8 +104,8 @@ public class ModelHandPedestal extends ModelBase { thumb.rotationPointY = -5.75F; thumb.rotationPointZ = -3; palm.addChild(thumb); - heldItemStack = - new ItemStackModelRenderer(this, resetResourceLocation); + heldItemStack = new ItemStackModelRenderer(this, + resetResourceLocation); heldItemStack.rotateAngleZ = (float) Math.PI; heldItemStack.rotateAngleX = (float) (Math.PI / 2); heldItemStack.setRotationPoint(0, -8.5F, -3.5F); @@ -115,7 +121,8 @@ public class ModelHandPedestal extends ModelBase { float partialRenderTicks, float scale) { handleHeldItemStack(pedestal.getHeldItemStack()); float gripScale = pedestal.getGripScale(); - float grip = easeInOut.eval(pedestal.getGrip(partialRenderTicks)) + float grip = easeInOut + .eval(pedestal.getGrip(partialRenderTicks)) * gripScale; float rotateAngleX = (float) (grip * 75 * Math.PI / 180 + (1 - grip) * 10 * Math.PI / 180); @@ -123,8 +130,9 @@ public class ModelHandPedestal extends ModelBase { for (int i = 0; i < fingers.length; i++) { ModelRenderer phalanges = fingers[i]; phalanges.rotateAngleX = rotateAngleX; - phalanges.rotateAngleZ = - rotateAngleZ * (2F / (fingers.length - 1) * i - 1); + phalanges.rotateAngleZ = rotateAngleZ + * (2F / (fingers.length - 1) * i + - 1); } thumb.rotateAngleX = (float) (grip * 60 * Math.PI / 180 + (1 - grip) * 10 * Math.PI / 180); @@ -143,7 +151,8 @@ public class ModelHandPedestal extends ModelBase { heldItemStack.rotateAngleX = 0; heldItemStack.rotationPointZ = 0; } else { - heldItemStack.rotateAngleX = (float) (Math.PI / 2); + heldItemStack.rotateAngleX = (float) (Math.PI + / 2); heldItemStack.rotationPointZ = -3.5F; } } diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelHeart.java b/src/main/java/darkknight/jewelrycraft/model/ModelHeart.java index f9a29e0..474dc69 100755 --- a/src/main/java/darkknight/jewelrycraft/model/ModelHeart.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelHeart.java @@ -11,14 +11,14 @@ import net.minecraft.entity.Entity; public class ModelHeart extends ModelBase { // fields - ModelRenderer s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, - s14, s15, s16, s17, s18, s19, s20, s21, s22; - ModelRenderer f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, - f14, f15, f16, f17, f18, f19, f20, f21, f22, f23, f24, f25, - f26; - ModelRenderer b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, b13, - b14, b15, b16, b17, b18, b19, b20, b21, b22, b23, b24, b25, - b26; + ModelRenderer s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, + s13, s14, s15, s16, s17, s18, s19, s20, s21, s22; + ModelRenderer f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, + f13, f14, f15, f16, f17, f18, f19, f20, f21, f22, + f23, f24, f25, f26; + ModelRenderer b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, + b13, b14, b15, b16, b17, b18, b19, b20, b21, b22, + b23, b24, b25, b26; public ModelHeart() { textureWidth = 64; @@ -471,10 +471,12 @@ public class ModelHeart extends ModelBase { @Override public void render(Entity entity, float angle1, float angle2, - float angle3, float angle4, float angle5, float angle6) { - super.render(entity, angle1, angle2, angle3, angle4, angle5, + float angle3, float angle4, float angle5, + float angle6) { + super.render(entity, angle1, angle2, angle3, angle4, + angle5, angle6); + setRotationAngles(angle1, angle2, angle3, angle4, angle5, angle6); - setRotationAngles(angle1, angle2, angle3, angle4, angle5, angle6); s1.render(angle6); s2.render(angle6); s3.render(angle6); @@ -558,8 +560,8 @@ public class ModelHeart extends ModelBase { model.rotateAngleZ = z; } - public void setRotationAngles(float f, float f1, float f2, float f3, - float f4, float f5) { + public void setRotationAngles(float f, float f1, float f2, + float f3, float f4, float f5) { super.setRotationAngles(f, f1, f2, f3, f4, f5, null); } } diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelJewlersCraftingBench.java b/src/main/java/darkknight/jewelrycraft/model/ModelJewlersCraftingBench.java index adf976d..1ecfeb5 100755 --- a/src/main/java/darkknight/jewelrycraft/model/ModelJewlersCraftingBench.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelJewlersCraftingBench.java @@ -156,8 +156,8 @@ public class ModelJewlersCraftingBench extends ModelBase { * @param f4 * @param f5 */ - public void setRotationAngles(float f, float f1, float f2, float f3, - float f4, float f5) { + public void setRotationAngles(float f, float f1, float f2, + float f3, float f4, float f5) { super.setRotationAngles(f, f1, f2, f3, f4, f5, null); } } diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelMask.java b/src/main/java/darkknight/jewelrycraft/model/ModelMask.java index 8d24ed7..d1934ab 100755 --- a/src/main/java/darkknight/jewelrycraft/model/ModelMask.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelMask.java @@ -65,8 +65,8 @@ public class ModelMask extends ModelBase { } /** - * This is a helper function from Tabula to set the rotation of model - * parts + * 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) { diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelMolder.java b/src/main/java/darkknight/jewelrycraft/model/ModelMolder.java index 7fdd195..36989af 100755 --- a/src/main/java/darkknight/jewelrycraft/model/ModelMolder.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelMolder.java @@ -92,8 +92,8 @@ public class ModelMolder extends ModelBase { * @param f4 * @param f5 */ - public void setRotationAngles(float f, float f1, float f2, float f3, - float f4, float f5) { + public void setRotationAngles(float f, float f1, float f2, + float f3, float f4, float f5) { super.setRotationAngles(f, f1, f2, f3, f4, f5, null); } } diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelNeckalce.java b/src/main/java/darkknight/jewelrycraft/model/ModelNeckalce.java index f6db653..537a8c2 100755 --- a/src/main/java/darkknight/jewelrycraft/model/ModelNeckalce.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelNeckalce.java @@ -65,16 +65,19 @@ public class ModelNeckalce extends ModelBase { int red = (ingotColor >> 16) & 0xff; int green = (ingotColor >> 8) & 0xff; int blue = ingotColor & 0xff; - GL11.glColor3f((float) red / 255, (float) green / 255, + GL11.glColor3f((float) red / 255, + (float) green / 255, (float) blue / 255); GL11.glPushMatrix(); - GL11.glTranslatef(this.neck1.offsetX, this.neck1.offsetY, + GL11.glTranslatef(this.neck1.offsetX, + this.neck1.offsetY, this.neck1.offsetZ); GL11.glTranslatef(this.neck1.rotationPointX * f5, this.neck1.rotationPointY * f5, this.neck1.rotationPointZ * f5); GL11.glScaled(0.5D, 0.5D, 0.5D); - GL11.glTranslatef(-this.neck1.offsetX, -this.neck1.offsetY, + GL11.glTranslatef(-this.neck1.offsetX, + -this.neck1.offsetY, -this.neck1.offsetZ); GL11.glTranslatef(-this.neck1.rotationPointX * f5, -this.neck1.rotationPointY * f5, @@ -82,13 +85,15 @@ public class ModelNeckalce extends ModelBase { this.neck1.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.neck7.offsetX, this.neck7.offsetY, + GL11.glTranslatef(this.neck7.offsetX, + this.neck7.offsetY, this.neck7.offsetZ); GL11.glTranslatef(this.neck7.rotationPointX * f5, this.neck7.rotationPointY * f5, this.neck7.rotationPointZ * f5); GL11.glScaled(0.3D, 0.5D, 0.5D); - GL11.glTranslatef(-this.neck7.offsetX, -this.neck7.offsetY, + GL11.glTranslatef(-this.neck7.offsetX, + -this.neck7.offsetY, -this.neck7.offsetZ); GL11.glTranslatef(-this.neck7.rotationPointX * f5, -this.neck7.rotationPointY * f5, @@ -96,13 +101,15 @@ public class ModelNeckalce extends ModelBase { this.neck7.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.neck8.offsetX, this.neck8.offsetY, + GL11.glTranslatef(this.neck8.offsetX, + this.neck8.offsetY, this.neck8.offsetZ); GL11.glTranslatef(this.neck8.rotationPointX * f5, this.neck8.rotationPointY * f5, this.neck8.rotationPointZ * f5); GL11.glScaled(0.3D, 0.5D, 0.5D); - GL11.glTranslatef(-this.neck8.offsetX, -this.neck8.offsetY, + GL11.glTranslatef(-this.neck8.offsetX, + -this.neck8.offsetY, -this.neck8.offsetZ); GL11.glTranslatef(-this.neck8.rotationPointX * f5, -this.neck8.rotationPointY * f5, @@ -110,13 +117,15 @@ public class ModelNeckalce extends ModelBase { this.neck8.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.neck3.offsetX, this.neck3.offsetY, + GL11.glTranslatef(this.neck3.offsetX, + this.neck3.offsetY, this.neck3.offsetZ); GL11.glTranslatef(this.neck3.rotationPointX * f5, this.neck3.rotationPointY * f5, this.neck3.rotationPointZ * f5); GL11.glScaled(0.5D, 0.5D, 0.5D); - GL11.glTranslatef(-this.neck3.offsetX, -this.neck3.offsetY, + GL11.glTranslatef(-this.neck3.offsetX, + -this.neck3.offsetY, -this.neck3.offsetZ); GL11.glTranslatef(-this.neck3.rotationPointX * f5, -this.neck3.rotationPointY * f5, @@ -124,13 +133,15 @@ public class ModelNeckalce extends ModelBase { this.neck3.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.neck6.offsetX, this.neck6.offsetY, + GL11.glTranslatef(this.neck6.offsetX, + this.neck6.offsetY, this.neck6.offsetZ); GL11.glTranslatef(this.neck6.rotationPointX * f5, this.neck6.rotationPointY * f5, this.neck6.rotationPointZ * f5); GL11.glScaled(0.5D, 0.5D, 0.5D); - GL11.glTranslatef(-this.neck6.offsetX, -this.neck6.offsetY, + GL11.glTranslatef(-this.neck6.offsetX, + -this.neck6.offsetY, -this.neck6.offsetZ); GL11.glTranslatef(-this.neck6.rotationPointX * f5, -this.neck6.rotationPointY * f5, @@ -138,13 +149,15 @@ public class ModelNeckalce extends ModelBase { this.neck6.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.neck9.offsetX, this.neck9.offsetY, + GL11.glTranslatef(this.neck9.offsetX, + this.neck9.offsetY, this.neck9.offsetZ); GL11.glTranslatef(this.neck9.rotationPointX * f5, this.neck9.rotationPointY * f5, this.neck9.rotationPointZ * f5); GL11.glScaled(0.5D, 0.5D, 0.5D); - GL11.glTranslatef(-this.neck9.offsetX, -this.neck9.offsetY, + GL11.glTranslatef(-this.neck9.offsetX, + -this.neck9.offsetY, -this.neck9.offsetZ); GL11.glTranslatef(-this.neck9.rotationPointX * f5, -this.neck9.rotationPointY * f5, @@ -152,13 +165,15 @@ public class ModelNeckalce extends ModelBase { this.neck9.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.neck4.offsetX, this.neck4.offsetY, + GL11.glTranslatef(this.neck4.offsetX, + this.neck4.offsetY, this.neck4.offsetZ); GL11.glTranslatef(this.neck4.rotationPointX * f5, this.neck4.rotationPointY * f5, this.neck4.rotationPointZ * f5); GL11.glScaled(0.5D, 0.5D, 0.5D); - GL11.glTranslatef(-this.neck4.offsetX, -this.neck4.offsetY, + GL11.glTranslatef(-this.neck4.offsetX, + -this.neck4.offsetY, -this.neck4.offsetZ); GL11.glTranslatef(-this.neck4.rotationPointX * f5, -this.neck4.rotationPointY * f5, @@ -166,13 +181,15 @@ public class ModelNeckalce extends ModelBase { this.neck4.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.neck2.offsetX, this.neck2.offsetY, + GL11.glTranslatef(this.neck2.offsetX, + this.neck2.offsetY, this.neck2.offsetZ); GL11.glTranslatef(this.neck2.rotationPointX * f5, this.neck2.rotationPointY * f5, this.neck2.rotationPointZ * f5); GL11.glScaled(0.5D, 0.5D, 0.5D); - GL11.glTranslatef(-this.neck2.offsetX, -this.neck2.offsetY, + GL11.glTranslatef(-this.neck2.offsetX, + -this.neck2.offsetY, -this.neck2.offsetZ); GL11.glTranslatef(-this.neck2.rotationPointX * f5, -this.neck2.rotationPointY * f5, @@ -180,13 +197,15 @@ public class ModelNeckalce extends ModelBase { this.neck2.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.neck5.offsetX, this.neck5.offsetY, + GL11.glTranslatef(this.neck5.offsetX, + this.neck5.offsetY, this.neck5.offsetZ); GL11.glTranslatef(this.neck5.rotationPointX * f5, this.neck5.rotationPointY * f5, this.neck5.rotationPointZ * f5); GL11.glScaled(0.5D, 0.5D, 0.5D); - GL11.glTranslatef(-this.neck5.offsetX, -this.neck5.offsetY, + GL11.glTranslatef(-this.neck5.offsetX, + -this.neck5.offsetY, -this.neck5.offsetZ); GL11.glTranslatef(-this.neck5.rotationPointX * f5, -this.neck5.rotationPointY * f5, @@ -199,19 +218,22 @@ public class ModelNeckalce extends ModelBase { int red = gemColor >> 16 & 0xff; int green = gemColor >> 8 & 0xff; int blue = gemColor & 0xff; - GL11.glColor3f((float) red / 255, (float) green / 255, + GL11.glColor3f((float) red / 255, + (float) green / 255, (float) blue / 255); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE_MINUS_DST_COLOR); GL11.glPushMatrix(); - GL11.glTranslatef(this.gem.offsetX, this.gem.offsetY, + GL11.glTranslatef(this.gem.offsetX, + this.gem.offsetY, this.gem.offsetZ); GL11.glTranslatef(this.gem.rotationPointX * f5, this.gem.rotationPointY * f5, this.gem.rotationPointZ * f5); GL11.glScaled(0.25D, 0.25D, 0.25D); - GL11.glTranslatef(-this.gem.offsetX, -this.gem.offsetY, + GL11.glTranslatef(-this.gem.offsetX, + -this.gem.offsetY, -this.gem.offsetZ); GL11.glTranslatef(-this.gem.rotationPointX * f5, -this.gem.rotationPointY * f5, @@ -224,8 +246,8 @@ public class ModelNeckalce extends ModelBase { } /** - * This is a helper function from Tabula to set the rotation of model - * parts + * 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) { diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelRing.java b/src/main/java/darkknight/jewelrycraft/model/ModelRing.java index d2f11c9..a9b8e34 100755 --- a/src/main/java/darkknight/jewelrycraft/model/ModelRing.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelRing.java @@ -49,16 +49,19 @@ public class ModelRing extends ModelBase { int red = (ingotColor >> 16) & 0xff; int green = (ingotColor >> 8) & 0xff; int blue = ingotColor & 0xff; - GL11.glColor3f((float) red / 255, (float) green / 255, + GL11.glColor3f((float) red / 255, + (float) green / 255, (float) blue / 255); GL11.glPushMatrix(); - GL11.glTranslatef(this.ring1.offsetX, this.ring1.offsetY, + GL11.glTranslatef(this.ring1.offsetX, + this.ring1.offsetY, this.ring1.offsetZ); GL11.glTranslatef(this.ring1.rotationPointX * f5, this.ring1.rotationPointY * f5, this.ring1.rotationPointZ * f5); GL11.glScaled(0.1D, 0.3D, 0.3D); - GL11.glTranslatef(-this.ring1.offsetX, -this.ring1.offsetY, + GL11.glTranslatef(-this.ring1.offsetX, + -this.ring1.offsetY, -this.ring1.offsetZ); GL11.glTranslatef(-this.ring1.rotationPointX * f5, -this.ring1.rotationPointY * f5, @@ -66,13 +69,15 @@ public class ModelRing extends ModelBase { this.ring1.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.ring2.offsetX, this.ring2.offsetY, + GL11.glTranslatef(this.ring2.offsetX, + this.ring2.offsetY, this.ring2.offsetZ); GL11.glTranslatef(this.ring2.rotationPointX * f5, this.ring2.rotationPointY * f5, this.ring2.rotationPointZ * f5); GL11.glScaled(0.1D, 0.3D, 0.3D); - GL11.glTranslatef(-this.ring2.offsetX, -this.ring2.offsetY, + GL11.glTranslatef(-this.ring2.offsetX, + -this.ring2.offsetY, -this.ring2.offsetZ); GL11.glTranslatef(-this.ring2.rotationPointX * f5, -this.ring2.rotationPointY * f5, @@ -80,13 +85,15 @@ public class ModelRing extends ModelBase { this.ring2.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.ring3.offsetX, this.ring3.offsetY, + GL11.glTranslatef(this.ring3.offsetX, + this.ring3.offsetY, this.ring3.offsetZ); GL11.glTranslatef(this.ring3.rotationPointX * f5, this.ring3.rotationPointY * f5, this.ring3.rotationPointZ * f5); GL11.glScaled(0.2D, 0.3D, 0.1D); - GL11.glTranslatef(-this.ring3.offsetX, -this.ring3.offsetY, + GL11.glTranslatef(-this.ring3.offsetX, + -this.ring3.offsetY, -this.ring3.offsetZ); GL11.glTranslatef(-this.ring3.rotationPointX * f5, -this.ring3.rotationPointY * f5, @@ -99,19 +106,22 @@ public class ModelRing extends ModelBase { int red = gemColor >> 16 & 0xff; int green = gemColor >> 8 & 0xff; int blue = gemColor & 0xff; - GL11.glColor3f((float) red / 255, (float) green / 255, + GL11.glColor3f((float) red / 255, + (float) green / 255, (float) blue / 255); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE_MINUS_DST_COLOR); GL11.glPushMatrix(); - GL11.glTranslatef(this.gem.offsetX, this.gem.offsetY, + GL11.glTranslatef(this.gem.offsetX, + this.gem.offsetY, this.gem.offsetZ); GL11.glTranslatef(this.gem.rotationPointX * f5, this.gem.rotationPointY * f5, this.gem.rotationPointZ * f5); GL11.glScaled(0.1D, 0.1D, 0.1D); - GL11.glTranslatef(-this.gem.offsetX, -this.gem.offsetY, + GL11.glTranslatef(-this.gem.offsetX, + -this.gem.offsetY, -this.gem.offsetZ); GL11.glTranslatef(-this.gem.rotationPointX * f5, -this.gem.rotationPointY * f5, @@ -119,13 +129,15 @@ public class ModelRing extends ModelBase { this.gem.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.gem1.offsetX, this.gem1.offsetY, + GL11.glTranslatef(this.gem1.offsetX, + this.gem1.offsetY, this.gem1.offsetZ); GL11.glTranslatef(this.gem1.rotationPointX * f5, this.gem1.rotationPointY * f5, this.gem1.rotationPointZ * f5); GL11.glScaled(0.1D, 0.05D, 0.1D); - GL11.glTranslatef(-this.gem1.offsetX, -this.gem1.offsetY, + GL11.glTranslatef(-this.gem1.offsetX, + -this.gem1.offsetY, -this.gem1.offsetZ); GL11.glTranslatef(-this.gem1.rotationPointX * f5, -this.gem1.rotationPointY * f5, @@ -133,13 +145,15 @@ public class ModelRing extends ModelBase { this.gem1.render(f5); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslatef(this.gem2.offsetX, this.gem2.offsetY, + GL11.glTranslatef(this.gem2.offsetX, + this.gem2.offsetY, this.gem2.offsetZ); GL11.glTranslatef(this.gem2.rotationPointX * f5, this.gem2.rotationPointY * f5, this.gem2.rotationPointZ * f5); GL11.glScaled(0.1D, 0.05D, 0.1D); - GL11.glTranslatef(-this.gem2.offsetX, -this.gem2.offsetY, + GL11.glTranslatef(-this.gem2.offsetX, + -this.gem2.offsetY, -this.gem2.offsetZ); GL11.glTranslatef(-this.gem2.rotationPointX * f5, -this.gem2.rotationPointY * f5, @@ -151,8 +165,8 @@ public class ModelRing extends ModelBase { } /** - * This is a helper function from Tabula to set the rotation of model - * parts + * 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) { diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelShadowEye.java b/src/main/java/darkknight/jewelrycraft/model/ModelShadowEye.java index ba3426c..1ea7819 100755 --- a/src/main/java/darkknight/jewelrycraft/model/ModelShadowEye.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelShadowEye.java @@ -22,7 +22,7 @@ public class ModelShadowEye extends ModelBase { ModelRenderer Cable2; ModelRenderer Cable3; ModelRenderer Cable4; - float field_82221_e, field_82220_d; + float field_82221_e, field_82220_d; /** * @@ -121,18 +121,21 @@ public class ModelShadowEye extends ModelBase { Eye.rotateAngleX = 0F; Eye.rotateAngleZ = 0F; if (f3 == 0) - Eye.rotateAngleY = (float) (0.5F * Math.PI); + Eye.rotateAngleY = (float) (0.5F + * Math.PI); else if (f3 == 1) Eye.rotateAngleY = (float) (Math.PI); else if (f3 == 2) - Eye.rotateAngleY = (float) (1.5F * Math.PI); + Eye.rotateAngleY = (float) (1.5F + * Math.PI); else if (f3 == 3) Eye.rotateAngleY = (float) (0F * Math.PI); } } public static float[] getRotation(double posX1, double posY1, - double posZ1, double posX2, double posY2, double posZ2) { + double posZ1, double posX2, double posY2, + double posZ2) { float[] rotation = new float[2]; double diffX = posX2 - posX1; double diffZ = posZ2 - posZ1; @@ -146,9 +149,11 @@ public class ModelShadowEye extends ModelBase { } else if (diffZ >= 0.0D && diffX <= 0.0D) { yaw = Math.toDegrees(-Math.atan(diffX / diffZ)); } else if (diffZ <= 0.0D && diffX >= 0.0D) { - yaw = -90D + Math.toDegrees(Math.atan(diffZ / diffX)); + yaw = -90D + Math.toDegrees( + Math.atan(diffZ / diffX)); } else if (diffZ <= 0.0D && diffX <= 0.0D) { - yaw = 90D + Math.toDegrees(Math.atan(diffZ / diffX)); + yaw = 90D + Math.toDegrees( + Math.atan(diffZ / diffX)); } rotation[0] = (float) yaw; return rotation; diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelShadowHand.java b/src/main/java/darkknight/jewelrycraft/model/ModelShadowHand.java index 116ba21..28d48d7 100755 --- a/src/main/java/darkknight/jewelrycraft/model/ModelShadowHand.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelShadowHand.java @@ -19,8 +19,11 @@ public class ModelShadowHand extends ModelHandPedestal { */ @Override protected void initPedestalRenderers() { - plinth = createModelRenderer(0, 0).addBox(-3, 6, -3, 6, 2, 6); - base = createModelRenderer(0, 15).addBox(-2, 0, -2, 4, 6, 4); - shaft = createModelRenderer(28, 0).addBox(-3, -4, -3, 6, 4, 6); + plinth = createModelRenderer(0, 0).addBox(-3, 6, -3, 6, 2, + 6); + base = createModelRenderer(0, 15).addBox(-2, 0, -2, 4, 6, + 4); + shaft = createModelRenderer(28, 0).addBox(-3, -4, -3, 6, 4, + 6); } } \ No newline at end of file diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelSmelter.java b/src/main/java/darkknight/jewelrycraft/model/ModelSmelter.java index d34d938..b5e3baf 100755 --- a/src/main/java/darkknight/jewelrycraft/model/ModelSmelter.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelSmelter.java @@ -292,8 +292,8 @@ public class ModelSmelter extends ModelBase { * @param f4 * @param f5 */ - public void setRotationAngles(float f, float f1, float f2, float f3, - float f4, float f5) { + public void setRotationAngles(float f, float f1, float f2, + float f3, float f4, float f5) { super.setRotationAngles(f, f1, f2, f3, f4, f5, null); } } -- cgit v1.2.3