summaryrefslogtreecommitdiff
path: root/src/main/java/darkknight/jewelrycraft/model
diff options
context:
space:
mode:
authorbculkin2442 <bjculkin@mix.wvu.edu>2019-08-22 20:01:40 -0400
committerbculkin2442 <bjculkin@mix.wvu.edu>2019-08-22 20:01:40 -0400
commit20bef6e26d948698398bd16aeab8c9e6b89110e4 (patch)
tree8a21e17f78b330435f4ce2d4355d72b773230aa7 /src/main/java/darkknight/jewelrycraft/model
parent26fb28edd1ebb6390f8803fed3876d222cb8fdba (diff)
Format/import cleanup
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/model')
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java38
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/model/ModelBracelet.java175
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/model/ModelDisplayer.java59
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/model/ModelEarrings.java36
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/model/ModelHalfHeart.java24
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/model/ModelHandPedestal.java72
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/model/ModelHeart.java24
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/model/ModelJewlersCraftingBench.java35
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/model/ModelMask.java27
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/model/ModelMolder.java19
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/model/ModelNeckalce.java181
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/model/ModelRing.java117
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/model/ModelShadowEye.java41
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/model/ModelShadowHand.java9
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/model/ModelSmelter.java69
15 files changed, 333 insertions, 593 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java b/src/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java
index fe5a183..8bdb629 100755
--- a/src/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java
@@ -16,23 +16,20 @@ import net.minecraft.util.ResourceLocation;
* @author Paul Fulham (pau101)
*/
public class ItemStackModelRenderer extends ModelRenderer {
- private RenderItem renderItem;
- private TextureManager textureManager;
- private ResourceLocation resetResourceLocation;
- private EntityItem entityItem;
- private Minecraft mc;
+ private RenderItem renderItem;
+ private TextureManager textureManager;
+ private ResourceLocation resetResourceLocation;
+ private EntityItem entityItem;
+ private Minecraft mc;
/**
* @param modelBase
* @param resetResourceLocation
*/
- public ItemStackModelRenderer(ModelBase modelBase,
- ResourceLocation resetResourceLocation) {
+ public ItemStackModelRenderer(ModelBase modelBase, ResourceLocation resetResourceLocation) {
super(modelBase);
- renderItem = (RenderItem) RenderManager.instance.entityRenderMap
- .get(EntityItem.class);
- textureManager = (mc = Minecraft.getMinecraft())
- .getTextureManager();
+ renderItem = (RenderItem) RenderManager.instance.entityRenderMap.get(EntityItem.class);
+ textureManager = (mc = Minecraft.getMinecraft()).getTextureManager();
this.resetResourceLocation = resetResourceLocation;
}
@@ -43,8 +40,7 @@ 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,18 +55,10 @@ public class ItemStackModelRenderer extends ModelRenderer {
textureManager = mc.getTextureManager();
GL11.glPushMatrix();
GL11.glTranslatef(offsetX, offsetY, offsetZ);
- GL11.glTranslatef(rotationPointX * scale,
- rotationPointY * scale,
- rotationPointZ * scale);
- GL11.glRotatef(rotateAngleZ
- * (180 / (float) Math.PI), 0, 0,
- 1);
- GL11.glRotatef(rotateAngleY
- * (180 / (float) Math.PI), 0, 1,
- 0);
- GL11.glRotatef(rotateAngleX
- * (180 / (float) Math.PI), 1, 0,
- 0);
+ GL11.glTranslatef(rotationPointX * scale, rotationPointY * scale, rotationPointZ * scale);
+ GL11.glRotatef(rotateAngleZ * (180 / (float) Math.PI), 0, 0, 1);
+ GL11.glRotatef(rotateAngleY * (180 / (float) Math.PI), 0, 1, 0);
+ GL11.glRotatef(rotateAngleX * (180 / (float) Math.PI), 1, 0, 0);
boolean fancyGraphics = mc.gameSettings.fancyGraphics;
mc.gameSettings.fancyGraphics = true;
renderItem.doRender(entityItem, 0, 0, 0, 0, 0);
diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelBracelet.java b/src/main/java/darkknight/jewelrycraft/model/ModelBracelet.java
index f63e4bf..f900a4d 100755
--- a/src/main/java/darkknight/jewelrycraft/model/ModelBracelet.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ModelBracelet.java
@@ -10,19 +10,19 @@ import net.minecraft.entity.Entity;
* ModelBiped - Either Mojang or a mod author Created using Tabula 4.1.1
*/
public class ModelBracelet extends ModelBase {
- public ModelRenderer metal1;
- public ModelRenderer metal2;
- public ModelRenderer metal3;
- public ModelRenderer metal4;
- public ModelRenderer gem1;
- public ModelRenderer gem2;
- public ModelRenderer gem3;
- public ModelRenderer gem4;
- public ModelRenderer gem5;
- public ModelRenderer gem6;
- public ModelRenderer gem7;
- public ModelRenderer gem8;
- public ModelRenderer gem9;
+ public ModelRenderer metal1;
+ public ModelRenderer metal2;
+ public ModelRenderer metal3;
+ public ModelRenderer metal4;
+ public ModelRenderer gem1;
+ public ModelRenderer gem2;
+ public ModelRenderer gem3;
+ public ModelRenderer gem4;
+ public ModelRenderer gem5;
+ public ModelRenderer gem6;
+ public ModelRenderer gem7;
+ public ModelRenderer gem8;
+ public ModelRenderer gem9;
public ModelBracelet() {
this.textureWidth = 16;
@@ -33,8 +33,7 @@ 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);
@@ -71,17 +70,14 @@ public class ModelBracelet extends ModelBase {
}
@Override
- 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) {
// GL11.glDisable(GL11.GL_LIGHTING);
if ((int) f3 != -1) {
int ingotColor = (int) f3;
int red = (ingotColor >> 16) & 0xff;
int green = (ingotColor >> 8) & 0xff;
int blue = ingotColor & 0xff;
- GL11.glColor3f((float) red / 255,
- (float) green / 255,
- (float) blue / 255);
+ GL11.glColor3f((float) red / 255, (float) green / 255, (float) blue / 255);
this.metal1.render(f5);
this.metal2.render(f5);
this.metal3.render(f5);
@@ -92,153 +88,96 @@ 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,
- (float) blue / 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.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE_MINUS_DST_COLOR);
GL11.glPushMatrix();
- GL11.glTranslatef(this.gem4.offsetX,
- this.gem4.offsetY,
- this.gem4.offsetZ);
- GL11.glTranslatef(this.gem4.rotationPointX * f5,
- this.gem4.rotationPointY * f5,
+ 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,
- -this.gem4.offsetZ);
- GL11.glTranslatef(-this.gem4.rotationPointX * f5,
- -this.gem4.rotationPointY * f5,
+ 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);
this.gem4.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.gem3.offsetX,
- this.gem3.offsetY,
- this.gem3.offsetZ);
- GL11.glTranslatef(this.gem3.rotationPointX * f5,
- this.gem3.rotationPointY * f5,
+ 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,
- -this.gem3.offsetZ);
- GL11.glTranslatef(-this.gem3.rotationPointX * f5,
- -this.gem3.rotationPointY * f5,
+ 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);
this.gem3.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.gem2.offsetX,
- this.gem2.offsetY,
- this.gem2.offsetZ);
- GL11.glTranslatef(this.gem2.rotationPointX * f5,
- this.gem2.rotationPointY * f5,
+ 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,
- -this.gem2.offsetZ);
- GL11.glTranslatef(-this.gem2.rotationPointX * f5,
- -this.gem2.rotationPointY * f5,
+ 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);
this.gem2.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.gem1.offsetX,
- this.gem1.offsetY,
- this.gem1.offsetZ);
- GL11.glTranslatef(this.gem1.rotationPointX * f5,
- this.gem1.rotationPointY * f5,
+ 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,
- -this.gem1.offsetZ);
- GL11.glTranslatef(-this.gem1.rotationPointX * f5,
- -this.gem1.rotationPointY * f5,
+ 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);
this.gem1.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.gem6.offsetX,
- this.gem6.offsetY,
- this.gem6.offsetZ);
- GL11.glTranslatef(this.gem6.rotationPointX * f5,
- this.gem6.rotationPointY * f5,
+ 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,
- -this.gem6.offsetZ);
- GL11.glTranslatef(-this.gem6.rotationPointX * f5,
- -this.gem6.rotationPointY * f5,
+ 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);
this.gem6.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.gem7.offsetX,
- this.gem7.offsetY,
- this.gem7.offsetZ);
- GL11.glTranslatef(this.gem7.rotationPointX * f5,
- this.gem7.rotationPointY * f5,
+ 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,
- -this.gem7.offsetZ);
- GL11.glTranslatef(-this.gem7.rotationPointX * f5,
- -this.gem7.rotationPointY * f5,
+ 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);
this.gem7.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.gem8.offsetX,
- this.gem8.offsetY,
- this.gem8.offsetZ);
- GL11.glTranslatef(this.gem8.rotationPointX * f5,
- this.gem8.rotationPointY * f5,
+ 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,
- -this.gem8.offsetZ);
- GL11.glTranslatef(-this.gem8.rotationPointX * f5,
- -this.gem8.rotationPointY * f5,
+ 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);
this.gem8.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.gem5.offsetX,
- this.gem5.offsetY,
- this.gem5.offsetZ);
- GL11.glTranslatef(this.gem5.rotationPointX * f5,
- this.gem5.rotationPointY * f5,
+ 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,
- -this.gem5.offsetZ);
- GL11.glTranslatef(-this.gem5.rotationPointX * f5,
- -this.gem5.rotationPointY * f5,
+ 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);
this.gem5.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.gem9.offsetX,
- this.gem9.offsetY,
- this.gem9.offsetZ);
- GL11.glTranslatef(this.gem9.rotationPointX * f5,
- this.gem9.rotationPointY * f5,
+ 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,
- -this.gem9.offsetZ);
- GL11.glTranslatef(-this.gem9.rotationPointX * f5,
- -this.gem9.rotationPointY * f5,
+ 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);
this.gem9.render(f5);
GL11.glPopMatrix();
@@ -248,11 +187,9 @@ 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) {
+ 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/darkknight/jewelrycraft/model/ModelDisplayer.java b/src/main/java/darkknight/jewelrycraft/model/ModelDisplayer.java
index 4668ab8..5198585 100755
--- a/src/main/java/darkknight/jewelrycraft/model/ModelDisplayer.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ModelDisplayer.java
@@ -8,31 +8,31 @@ import net.minecraft.entity.Entity;
public class ModelDisplayer extends ModelBase {
// fields
- ModelRenderer Base;
- ModelRenderer Ring11;
- ModelRenderer Ring12;
- ModelRenderer Ring13;
- ModelRenderer Ring14;
- ModelRenderer Ring31;
- ModelRenderer Ring21;
- ModelRenderer Ring32;
- ModelRenderer Ring22;
- ModelRenderer Ring33;
- ModelRenderer Ring23;
- ModelRenderer Ring34;
- ModelRenderer Ring24;
- ModelRenderer Ring25;
- ModelRenderer Ring26;
- ModelRenderer Ring27;
- ModelRenderer Ring28;
- ModelRenderer Ring35;
- ModelRenderer Ring36;
- ModelRenderer Ring37;
- ModelRenderer Ring38;
- ModelRenderer Ring39;
- ModelRenderer Ring310;
- ModelRenderer Ring311;
- ModelRenderer Ring312;
+ ModelRenderer Base;
+ ModelRenderer Ring11;
+ ModelRenderer Ring12;
+ ModelRenderer Ring13;
+ ModelRenderer Ring14;
+ ModelRenderer Ring31;
+ ModelRenderer Ring21;
+ ModelRenderer Ring32;
+ ModelRenderer Ring22;
+ ModelRenderer Ring33;
+ ModelRenderer Ring23;
+ ModelRenderer Ring34;
+ ModelRenderer Ring24;
+ ModelRenderer Ring25;
+ ModelRenderer Ring26;
+ ModelRenderer Ring27;
+ ModelRenderer Ring28;
+ ModelRenderer Ring35;
+ ModelRenderer Ring36;
+ ModelRenderer Ring37;
+ ModelRenderer Ring38;
+ ModelRenderer Ring39;
+ ModelRenderer Ring310;
+ ModelRenderer Ring311;
+ ModelRenderer Ring312;
/**
*
@@ -202,8 +202,7 @@ public class ModelDisplayer extends ModelBase {
* @param f5
*/
@Override
- 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) {
GL11.glPushMatrix();
Base.render(f5);
GL11.glTranslatef(0.0F, 0F - f, 0.0F);
@@ -242,8 +241,7 @@ public class ModelDisplayer extends ModelBase {
* @param y
* @param z
*/
- 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.rotateAngleY = y;
model.rotateAngleZ = z;
@@ -257,8 +255,7 @@ 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 ed378e9..426a465 100755
--- a/src/main/java/darkknight/jewelrycraft/model/ModelEarrings.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ModelEarrings.java
@@ -8,14 +8,14 @@ import net.minecraft.entity.Entity;
public class ModelEarrings extends ModelBase {
// fields
- ModelRenderer MetalPart00;
- ModelRenderer MetalPart10;
- ModelRenderer MetalPart20;
- ModelRenderer Gem0;
- ModelRenderer Gem1;
- ModelRenderer MetalPart01;
- ModelRenderer MetalPart11;
- ModelRenderer MetalPart21;
+ ModelRenderer MetalPart00;
+ ModelRenderer MetalPart10;
+ ModelRenderer MetalPart20;
+ ModelRenderer Gem0;
+ ModelRenderer Gem1;
+ ModelRenderer MetalPart01;
+ ModelRenderer MetalPart11;
+ ModelRenderer MetalPart21;
public ModelEarrings() {
textureWidth = 32;
@@ -71,8 +71,7 @@ public class ModelEarrings extends ModelBase {
}
@Override
- 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);
setRotationAngles(f, f1, f2, f3, f4, f5);
GL11.glPushMatrix();
@@ -82,9 +81,7 @@ 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,
- (float) blue / 255);
+ GL11.glColor3f((float) red / 255, (float) green / 255, (float) blue / 255);
MetalPart00.render(f5);
MetalPart10.render(f5);
MetalPart20.render(f5);
@@ -94,15 +91,12 @@ public class ModelEarrings extends ModelBase {
}
if ((int) f4 != -1) {
GL11.glEnable(GL11.GL_BLEND);
- GL11.glBlendFunc(GL11.GL_SRC_COLOR,
- GL11.GL_ONE_MINUS_DST_COLOR);
+ GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE_MINUS_DST_COLOR);
int gemColor = (int) f4;
int red = gemColor >> 16 & 0xff;
int green = gemColor >> 8 & 0xff;
int blue = gemColor & 0xff;
- GL11.glColor3f((float) red / 255,
- (float) green / 255,
- (float) blue / 255);
+ GL11.glColor3f((float) red / 255, (float) green / 255, (float) blue / 255);
Gem0.render(f5);
Gem1.render(f5);
GL11.glDisable(GL11.GL_BLEND);
@@ -111,15 +105,13 @@ public class ModelEarrings extends ModelBase {
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.rotateAngleY = y;
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 016bf02..ec564b7 100755
--- a/src/main/java/darkknight/jewelrycraft/model/ModelHalfHeart.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ModelHalfHeart.java
@@ -11,12 +11,9 @@ 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 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,
+ 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;
public ModelHalfHeart() {
@@ -415,13 +412,10 @@ public class ModelHalfHeart extends ModelBase {
}
@Override
- public void render(Entity entity, float angle1, float angle2,
- float angle3, float angle4, float angle5,
+ 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, angle6);
- setRotationAngles(angle1, angle2, angle3, angle4, angle5,
- angle6);
+ super.render(entity, angle1, angle2, angle3, angle4, angle5, angle6);
+ setRotationAngles(angle1, angle2, angle3, angle4, angle5, angle6);
s1.render(angle6);
s2.render(angle6);
s3.render(angle6);
@@ -489,15 +483,13 @@ public class ModelHalfHeart extends ModelBase {
b14.render(angle6);
}
- 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.rotateAngleY = y;
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 fc02886..09ba2e5 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;
- private ItemStackModelRenderer heldItemStack;
- private CubicBezier easeInOut;
+ protected ModelRenderer plinth;
+ protected ModelRenderer base;
+ protected ModelRenderer shaft;
+ private ModelRenderer palm;
+ private ModelRenderer[] fingers;
+ private ModelRenderer thumb;
+ private ItemStackModelRenderer heldItemStack;
+ private CubicBezier easeInOut;
/**
* @param resetResourceLocation
@@ -40,12 +40,9 @@ 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);
}
/**
@@ -60,10 +57,8 @@ 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;
}
@@ -72,30 +67,22 @@ public class ModelHandPedestal extends ModelBase {
* @return
*/
private ModelRenderer createPhalanges() {
- return createModelRenderer(0, 0)
- .addBox(-1, -1.5F, 0, 2, 3, 5)
- .addBox(-1, -5.5F, 2, 2, 4, 3);
+ return createModelRenderer(0, 0).addBox(-1, -1.5F, 0, 2, 3, 5).addBox(-1, -5.5F, 2, 2, 4, 3);
}
/**
* @param resetResourceLocation
*/
- private void initHandModelRenderers(
- ResourceLocation resetResourceLocation) {
- palm = createModelRenderer(0, 0).addBox(-4, -8, -4, 8, 4,
- 8);
+ private void initHandModelRenderers(ResourceLocation resetResourceLocation) {
+ 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,
- MathHelper.cos(theta) * 5 - 1);
+ phalanges.setRotationPoint(MathHelper.sin(theta) * 5, -5.75F, MathHelper.cos(theta) * 5 - 1);
fingers[i] = phalanges;
palm.addChild(phalanges);
}
@@ -104,8 +91,7 @@ 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);
@@ -117,25 +103,18 @@ public class ModelHandPedestal extends ModelBase {
* @param partialRenderTicks
* @param scale
*/
- public void render(TileEntityHandPedestal pedestal,
- float partialRenderTicks, float scale) {
+ public void render(TileEntityHandPedestal pedestal, float partialRenderTicks, float scale) {
handleHeldItemStack(pedestal.getHeldItemStack());
float gripScale = pedestal.getGripScale();
- float grip = easeInOut
- .eval(pedestal.getGrip(partialRenderTicks))
- * gripScale;
- float rotateAngleX = (float) (grip * 75 * Math.PI / 180
- + (1 - grip) * 10 * Math.PI / 180);
+ float grip = easeInOut.eval(pedestal.getGrip(partialRenderTicks)) * gripScale;
+ float rotateAngleX = (float) (grip * 75 * Math.PI / 180 + (1 - grip) * 10 * Math.PI / 180);
float rotateAngleZ = (float) (grip * 20 * Math.PI / 180);
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);
+ thumb.rotateAngleX = (float) (grip * 60 * Math.PI / 180 + (1 - grip) * 10 * Math.PI / 180);
thumb.rotateAngleZ = rotateAngleZ;
plinth.render(scale);
}
@@ -151,8 +130,7 @@ 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 474dc69..d24e83a 100755
--- a/src/main/java/darkknight/jewelrycraft/model/ModelHeart.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ModelHeart.java
@@ -11,13 +11,10 @@ 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,
+ 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,
+ 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() {
@@ -470,13 +467,10 @@ public class ModelHeart extends ModelBase {
}
@Override
- public void render(Entity entity, float angle1, float angle2,
- float angle3, float angle4, float angle5,
+ 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, angle6);
- setRotationAngles(angle1, angle2, angle3, angle4, angle5,
- angle6);
+ super.render(entity, angle1, angle2, angle3, angle4, angle5, angle6);
+ setRotationAngles(angle1, angle2, angle3, angle4, angle5, angle6);
s1.render(angle6);
s2.render(angle6);
s3.render(angle6);
@@ -553,15 +547,13 @@ public class ModelHeart extends ModelBase {
b26.render(angle6);
}
- 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.rotateAngleY = y;
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 1ecfeb5..84d60ec 100755
--- a/src/main/java/darkknight/jewelrycraft/model/ModelJewlersCraftingBench.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ModelJewlersCraftingBench.java
@@ -6,19 +6,19 @@ import net.minecraft.entity.Entity;
public class ModelJewlersCraftingBench extends ModelBase {
// fields
- ModelRenderer Leg1;
- ModelRenderer Leg2;
- ModelRenderer Leg3;
- ModelRenderer Leg4;
- ModelRenderer Top;
- ModelRenderer Support1;
- ModelRenderer Support2;
- ModelRenderer Support3;
- ModelRenderer Support4;
- ModelRenderer Support5;
- ModelRenderer Support6;
- ModelRenderer Support7;
- ModelRenderer Support8;
+ ModelRenderer Leg1;
+ ModelRenderer Leg2;
+ ModelRenderer Leg3;
+ ModelRenderer Leg4;
+ ModelRenderer Top;
+ ModelRenderer Support1;
+ ModelRenderer Support2;
+ ModelRenderer Support3;
+ ModelRenderer Support4;
+ ModelRenderer Support5;
+ ModelRenderer Support6;
+ ModelRenderer Support7;
+ ModelRenderer Support8;
/**
*
@@ -116,8 +116,7 @@ public class ModelJewlersCraftingBench extends ModelBase {
* @param f5
*/
@Override
- 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);
setRotationAngles(f, f1, f2, f3, f4, f5);
Leg1.render(f5);
@@ -141,8 +140,7 @@ public class ModelJewlersCraftingBench extends ModelBase {
* @param y
* @param z
*/
- 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.rotateAngleY = y;
model.rotateAngleZ = z;
@@ -156,8 +154,7 @@ 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 d1934ab..f3313c2 100755
--- a/src/main/java/darkknight/jewelrycraft/model/ModelMask.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ModelMask.java
@@ -8,15 +8,15 @@ import net.minecraft.entity.Entity;
* ModelMask - OnyxDarkKnight Created using Tabula 4.1.1
*/
public class ModelMask extends ModelBase {
- public ModelRenderer shape1;
- public ModelRenderer shape2;
- public ModelRenderer shape3;
- public ModelRenderer shape4;
- public ModelRenderer shape5;
- public ModelRenderer shape6;
- public ModelRenderer shape7;
- public ModelRenderer shape8;
- public ModelRenderer shape9;
+ public ModelRenderer shape1;
+ public ModelRenderer shape2;
+ public ModelRenderer shape3;
+ public ModelRenderer shape4;
+ public ModelRenderer shape5;
+ public ModelRenderer shape6;
+ public ModelRenderer shape7;
+ public ModelRenderer shape8;
+ public ModelRenderer shape9;
public ModelMask() {
this.textureWidth = 64;
@@ -51,8 +51,7 @@ public class ModelMask extends ModelBase {
}
@Override
- 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) {
this.shape6.render(f5);
this.shape7.render(f5);
this.shape4.render(f5);
@@ -65,11 +64,9 @@ 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) {
+ 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/darkknight/jewelrycraft/model/ModelMolder.java b/src/main/java/darkknight/jewelrycraft/model/ModelMolder.java
index 36989af..119d2c4 100755
--- a/src/main/java/darkknight/jewelrycraft/model/ModelMolder.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ModelMolder.java
@@ -6,11 +6,11 @@ import net.minecraft.entity.Entity;
public class ModelMolder extends ModelBase {
// fields
- ModelRenderer Base;
- ModelRenderer Side;
- ModelRenderer Side1;
- ModelRenderer Side2;
- ModelRenderer Side3;
+ ModelRenderer Base;
+ ModelRenderer Side;
+ ModelRenderer Side1;
+ ModelRenderer Side2;
+ ModelRenderer Side3;
/**
*
@@ -60,8 +60,7 @@ public class ModelMolder extends ModelBase {
* @param f5
*/
@Override
- 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);
setRotationAngles(f, f1, f2, f3, f4, f5);
Base.render(f5);
@@ -77,8 +76,7 @@ public class ModelMolder extends ModelBase {
* @param y
* @param z
*/
- 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.rotateAngleY = y;
model.rotateAngleZ = z;
@@ -92,8 +90,7 @@ 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 537a8c2..d1da191 100755
--- a/src/main/java/darkknight/jewelrycraft/model/ModelNeckalce.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ModelNeckalce.java
@@ -10,16 +10,16 @@ import net.minecraft.entity.Entity;
* ModelNeckalce - OnyxDarkKnight Created using Tabula 4.1.1
*/
public class ModelNeckalce extends ModelBase {
- public ModelRenderer neck1;
- public ModelRenderer neck2;
- public ModelRenderer neck3;
- public ModelRenderer neck4;
- public ModelRenderer neck5;
- public ModelRenderer neck6;
- public ModelRenderer neck7;
- public ModelRenderer neck8;
- public ModelRenderer neck9;
- public ModelRenderer gem;
+ public ModelRenderer neck1;
+ public ModelRenderer neck2;
+ public ModelRenderer neck3;
+ public ModelRenderer neck4;
+ public ModelRenderer neck5;
+ public ModelRenderer neck6;
+ public ModelRenderer neck7;
+ public ModelRenderer neck8;
+ public ModelRenderer neck9;
+ public ModelRenderer gem;
public ModelNeckalce() {
this.textureWidth = 32;
@@ -57,158 +57,101 @@ public class ModelNeckalce extends ModelBase {
}
@Override
- 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) {
// GL11.glDisable(GL11.GL_LIGHTING);
if ((int) f3 != -1) {
int ingotColor = (int) f3;
int red = (ingotColor >> 16) & 0xff;
int green = (ingotColor >> 8) & 0xff;
int blue = ingotColor & 0xff;
- GL11.glColor3f((float) red / 255,
- (float) green / 255,
- (float) blue / 255);
+ GL11.glColor3f((float) red / 255, (float) green / 255, (float) blue / 255);
GL11.glPushMatrix();
- GL11.glTranslatef(this.neck1.offsetX,
- this.neck1.offsetY,
- this.neck1.offsetZ);
- GL11.glTranslatef(this.neck1.rotationPointX * f5,
- this.neck1.rotationPointY * f5,
+ 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,
- -this.neck1.offsetZ);
- GL11.glTranslatef(-this.neck1.rotationPointX * f5,
- -this.neck1.rotationPointY * f5,
+ 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);
this.neck1.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.neck7.offsetX,
- this.neck7.offsetY,
- this.neck7.offsetZ);
- GL11.glTranslatef(this.neck7.rotationPointX * f5,
- this.neck7.rotationPointY * f5,
+ 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,
- -this.neck7.offsetZ);
- GL11.glTranslatef(-this.neck7.rotationPointX * f5,
- -this.neck7.rotationPointY * f5,
+ 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);
this.neck7.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.neck8.offsetX,
- this.neck8.offsetY,
- this.neck8.offsetZ);
- GL11.glTranslatef(this.neck8.rotationPointX * f5,
- this.neck8.rotationPointY * f5,
+ 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,
- -this.neck8.offsetZ);
- GL11.glTranslatef(-this.neck8.rotationPointX * f5,
- -this.neck8.rotationPointY * f5,
+ 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);
this.neck8.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.neck3.offsetX,
- this.neck3.offsetY,
- this.neck3.offsetZ);
- GL11.glTranslatef(this.neck3.rotationPointX * f5,
- this.neck3.rotationPointY * f5,
+ 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,
- -this.neck3.offsetZ);
- GL11.glTranslatef(-this.neck3.rotationPointX * f5,
- -this.neck3.rotationPointY * f5,
+ 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);
this.neck3.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.neck6.offsetX,
- this.neck6.offsetY,
- this.neck6.offsetZ);
- GL11.glTranslatef(this.neck6.rotationPointX * f5,
- this.neck6.rotationPointY * f5,
+ 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,
- -this.neck6.offsetZ);
- GL11.glTranslatef(-this.neck6.rotationPointX * f5,
- -this.neck6.rotationPointY * f5,
+ 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);
this.neck6.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.neck9.offsetX,
- this.neck9.offsetY,
- this.neck9.offsetZ);
- GL11.glTranslatef(this.neck9.rotationPointX * f5,
- this.neck9.rotationPointY * f5,
+ 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,
- -this.neck9.offsetZ);
- GL11.glTranslatef(-this.neck9.rotationPointX * f5,
- -this.neck9.rotationPointY * f5,
+ 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);
this.neck9.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.neck4.offsetX,
- this.neck4.offsetY,
- this.neck4.offsetZ);
- GL11.glTranslatef(this.neck4.rotationPointX * f5,
- this.neck4.rotationPointY * f5,
+ 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,
- -this.neck4.offsetZ);
- GL11.glTranslatef(-this.neck4.rotationPointX * f5,
- -this.neck4.rotationPointY * f5,
+ 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);
this.neck4.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.neck2.offsetX,
- this.neck2.offsetY,
- this.neck2.offsetZ);
- GL11.glTranslatef(this.neck2.rotationPointX * f5,
- this.neck2.rotationPointY * f5,
+ 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,
- -this.neck2.offsetZ);
- GL11.glTranslatef(-this.neck2.rotationPointX * f5,
- -this.neck2.rotationPointY * f5,
+ 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);
this.neck2.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.neck5.offsetX,
- this.neck5.offsetY,
- this.neck5.offsetZ);
- GL11.glTranslatef(this.neck5.rotationPointX * f5,
- this.neck5.rotationPointY * f5,
+ 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,
- -this.neck5.offsetZ);
- GL11.glTranslatef(-this.neck5.rotationPointX * f5,
- -this.neck5.rotationPointY * f5,
+ 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);
this.neck5.render(f5);
GL11.glPopMatrix();
@@ -218,25 +161,15 @@ 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,
- (float) blue / 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.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE_MINUS_DST_COLOR);
GL11.glPushMatrix();
- 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.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,
- -this.gem.offsetZ);
- GL11.glTranslatef(-this.gem.rotationPointX * f5,
- -this.gem.rotationPointY * f5,
+ 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);
this.gem.render(f5);
GL11.glPopMatrix();
@@ -246,11 +179,9 @@ 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) {
+ 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/darkknight/jewelrycraft/model/ModelRing.java b/src/main/java/darkknight/jewelrycraft/model/ModelRing.java
index a9b8e34..2bde63d 100755
--- a/src/main/java/darkknight/jewelrycraft/model/ModelRing.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ModelRing.java
@@ -10,12 +10,12 @@ import net.minecraft.entity.Entity;
* ModelRing - OnyxDarkKnight Created using Tabula 4.1.1
*/
public class ModelRing extends ModelBase {
- public ModelRenderer ring1;
- public ModelRenderer ring2;
- public ModelRenderer ring3;
- public ModelRenderer gem;
- public ModelRenderer gem1;
- public ModelRenderer gem2;
+ public ModelRenderer ring1;
+ public ModelRenderer ring2;
+ public ModelRenderer ring3;
+ public ModelRenderer gem;
+ public ModelRenderer gem1;
+ public ModelRenderer gem2;
public ModelRing() {
this.textureWidth = 32;
@@ -41,62 +41,41 @@ public class ModelRing extends ModelBase {
}
@Override
- 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) {
// GL11.glEnable(GL11.GL_LIGHTING);
if ((int) f3 != -1) {
int ingotColor = (int) f3;
int red = (ingotColor >> 16) & 0xff;
int green = (ingotColor >> 8) & 0xff;
int blue = ingotColor & 0xff;
- GL11.glColor3f((float) red / 255,
- (float) green / 255,
- (float) blue / 255);
+ GL11.glColor3f((float) red / 255, (float) green / 255, (float) blue / 255);
GL11.glPushMatrix();
- GL11.glTranslatef(this.ring1.offsetX,
- this.ring1.offsetY,
- this.ring1.offsetZ);
- GL11.glTranslatef(this.ring1.rotationPointX * f5,
- this.ring1.rotationPointY * f5,
+ 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,
- -this.ring1.offsetZ);
- GL11.glTranslatef(-this.ring1.rotationPointX * f5,
- -this.ring1.rotationPointY * f5,
+ 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);
this.ring1.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.ring2.offsetX,
- this.ring2.offsetY,
- this.ring2.offsetZ);
- GL11.glTranslatef(this.ring2.rotationPointX * f5,
- this.ring2.rotationPointY * f5,
+ 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,
- -this.ring2.offsetZ);
- GL11.glTranslatef(-this.ring2.rotationPointX * f5,
- -this.ring2.rotationPointY * f5,
+ 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);
this.ring2.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.ring3.offsetX,
- this.ring3.offsetY,
- this.ring3.offsetZ);
- GL11.glTranslatef(this.ring3.rotationPointX * f5,
- this.ring3.rotationPointY * f5,
+ 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,
- -this.ring3.offsetZ);
- GL11.glTranslatef(-this.ring3.rotationPointX * f5,
- -this.ring3.rotationPointY * f5,
+ 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);
this.ring3.render(f5);
GL11.glPopMatrix();
@@ -106,57 +85,35 @@ 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,
- (float) blue / 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.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE_MINUS_DST_COLOR);
GL11.glPushMatrix();
- 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.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,
- -this.gem.offsetZ);
- GL11.glTranslatef(-this.gem.rotationPointX * f5,
- -this.gem.rotationPointY * f5,
+ 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);
this.gem.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.gem1.offsetX,
- this.gem1.offsetY,
- this.gem1.offsetZ);
- GL11.glTranslatef(this.gem1.rotationPointX * f5,
- this.gem1.rotationPointY * f5,
+ 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,
- -this.gem1.offsetZ);
- GL11.glTranslatef(-this.gem1.rotationPointX * f5,
- -this.gem1.rotationPointY * f5,
+ 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);
this.gem1.render(f5);
GL11.glPopMatrix();
GL11.glPushMatrix();
- GL11.glTranslatef(this.gem2.offsetX,
- this.gem2.offsetY,
- this.gem2.offsetZ);
- GL11.glTranslatef(this.gem2.rotationPointX * f5,
- this.gem2.rotationPointY * f5,
+ 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,
- -this.gem2.offsetZ);
- GL11.glTranslatef(-this.gem2.rotationPointX * f5,
- -this.gem2.rotationPointY * f5,
+ 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);
this.gem2.render(f5);
GL11.glPopMatrix();
@@ -165,11 +122,9 @@ 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) {
+ 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/darkknight/jewelrycraft/model/ModelShadowEye.java b/src/main/java/darkknight/jewelrycraft/model/ModelShadowEye.java
index 1ea7819..8116c45 100755
--- a/src/main/java/darkknight/jewelrycraft/model/ModelShadowEye.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ModelShadowEye.java
@@ -13,16 +13,16 @@ import net.minecraft.entity.Entity;
public class ModelShadowEye extends ModelBase {
// fields
- ModelRenderer Eye;
- ModelRenderer Platform1;
- ModelRenderer Platform2;
- ModelRenderer Atachement1;
- ModelRenderer Atachement2;
- ModelRenderer Cable1;
- ModelRenderer Cable2;
- ModelRenderer Cable3;
- ModelRenderer Cable4;
- float field_82221_e, field_82220_d;
+ ModelRenderer Eye;
+ ModelRenderer Platform1;
+ ModelRenderer Platform2;
+ ModelRenderer Atachement1;
+ ModelRenderer Atachement2;
+ ModelRenderer Cable1;
+ ModelRenderer Cable2;
+ ModelRenderer Cable3;
+ ModelRenderer Cable4;
+ float field_82221_e, field_82220_d;
/**
*
@@ -96,8 +96,7 @@ public class ModelShadowEye extends ModelBase {
* @param f5
*/
@Override
- 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) {
Platform1.render(f5);
Platform2.render(f5);
Atachement1.render(f5);
@@ -121,20 +120,17 @@ 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,
+ public static float[] getRotation(double posX1, double posY1, double posZ1, double posX2, double posY2,
double posZ2) {
float[] rotation = new float[2];
double diffX = posX2 - posX1;
@@ -149,11 +145,9 @@ 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;
@@ -165,8 +159,7 @@ public class ModelShadowEye extends ModelBase {
* @param y
* @param z
*/
- 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.rotateAngleY = y;
model.rotateAngleZ = z;
diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelShadowHand.java b/src/main/java/darkknight/jewelrycraft/model/ModelShadowHand.java
index 28d48d7..116ba21 100755
--- a/src/main/java/darkknight/jewelrycraft/model/ModelShadowHand.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ModelShadowHand.java
@@ -19,11 +19,8 @@ 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 b5e3baf..7489cf3 100755
--- a/src/main/java/darkknight/jewelrycraft/model/ModelSmelter.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ModelSmelter.java
@@ -6,36 +6,36 @@ import net.minecraft.entity.Entity;
public class ModelSmelter extends ModelBase {
// fields
- ModelRenderer Support1;
- ModelRenderer Support2;
- ModelRenderer Hold1;
- ModelRenderer Hold2;
- ModelRenderer SmelterBase;
- ModelRenderer SmelterSide1;
- ModelRenderer SmelterSide2;
- ModelRenderer SmelterSide3;
- ModelRenderer SmelterSide4;
- ModelRenderer SmelterSide5;
- ModelRenderer SmelterSide6;
- ModelRenderer SmelterSide7;
- ModelRenderer SmelterSide8;
- ModelRenderer SmelterSide9;
- ModelRenderer SmelterSide10;
- ModelRenderer SmelterSide11;
- ModelRenderer SmelterSide12;
- ModelRenderer HeatSourceSide1;
- ModelRenderer HeatSourceSide2;
- ModelRenderer HeatSourceSide3;
- ModelRenderer HeatSourceSide4;
- ModelRenderer HeatSourceSide5;
- ModelRenderer HeatSourceBase;
- ModelRenderer HeatSourceSide6;
- ModelRenderer HeatSourceSide7;
- ModelRenderer HeatSourceSide8;
- ModelRenderer HeatSourceSide9;
- ModelRenderer HeatSourceSide10;
- ModelRenderer HeatSourceSide11;
- ModelRenderer HeatSourceSide12;
+ ModelRenderer Support1;
+ ModelRenderer Support2;
+ ModelRenderer Hold1;
+ ModelRenderer Hold2;
+ ModelRenderer SmelterBase;
+ ModelRenderer SmelterSide1;
+ ModelRenderer SmelterSide2;
+ ModelRenderer SmelterSide3;
+ ModelRenderer SmelterSide4;
+ ModelRenderer SmelterSide5;
+ ModelRenderer SmelterSide6;
+ ModelRenderer SmelterSide7;
+ ModelRenderer SmelterSide8;
+ ModelRenderer SmelterSide9;
+ ModelRenderer SmelterSide10;
+ ModelRenderer SmelterSide11;
+ ModelRenderer SmelterSide12;
+ ModelRenderer HeatSourceSide1;
+ ModelRenderer HeatSourceSide2;
+ ModelRenderer HeatSourceSide3;
+ ModelRenderer HeatSourceSide4;
+ ModelRenderer HeatSourceSide5;
+ ModelRenderer HeatSourceBase;
+ ModelRenderer HeatSourceSide6;
+ ModelRenderer HeatSourceSide7;
+ ModelRenderer HeatSourceSide8;
+ ModelRenderer HeatSourceSide9;
+ ModelRenderer HeatSourceSide10;
+ ModelRenderer HeatSourceSide11;
+ ModelRenderer HeatSourceSide12;
/**
*
@@ -235,8 +235,7 @@ public class ModelSmelter extends ModelBase {
* @param f5
*/
@Override
- 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);
setRotationAngles(f, f1, f2, f3, f4, f5);
Support1.render(f5);
@@ -277,8 +276,7 @@ public class ModelSmelter extends ModelBase {
* @param y
* @param z
*/
- 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.rotateAngleY = y;
model.rotateAngleZ = z;
@@ -292,8 +290,7 @@ 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);
}
}