Update modifiers, start travellers gear

This commit is contained in:
mDiyo committed 2014-06-30 22:26:00 -08:00
1 parent 0230307f0a
commit c525493545
96 files changed
+2827 -1573

No files matched your search

@@ -1,10 +1,11 @@
package tconstruct.armor.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.util.MathHelper;
public class WingModel extends ModelBase
public class WingModel extends ModelBiped
{
ModelRenderer WingBaseRight;
ModelRenderer WingEdgeRight;
@@ -21,37 +22,37 @@ public class WingModel extends ModelBase
public WingModel()
{
super(0.25f, 0, 64, 64);
textureWidth = 64;
textureHeight = 64;
textureHeight = 32;
// Right Wing
WingBaseRight = new ModelRenderer(this, 0, 41);
//Right Wing
WingBaseRight = new ModelRenderer(this, 0, 9);
WingBaseRight.addBox(-0.5F, -1F, 0F, 1, 2, 10);
WingBaseRight.setRotationPoint(-1F, 1F, 0F);
setRotation(WingBaseRight, 0.5235988F, -0.5235988F, 0F);
WingEdgeRight = new ModelRenderer(this, 0, 53); // Texture position
WingEdgeRight.addBox(0F, 0F, -2F, 1, 9, 2); // Offset, Size
WingEdgeRight.setRotationPoint(-0.502F, -1F, 10F); // Negative x, y - 1,
// Position
setRotation(WingEdgeRight, 0.5235988F, 0F, 0F); // Angle in radians
WingEdgeRight = new ModelRenderer(this, 0, 21); //Texture position
WingEdgeRight.addBox(0F, 0F, -2F, 1, 9, 2); //Offset, Size
WingEdgeRight.setRotationPoint(-0.502F, -1F, 10F); //Negative x, y - 1, Position
setRotation(WingEdgeRight, 0.5235988F, 0F, 0F); //Angle in radians
WingInsetRight = new ModelRenderer(this, 6, 53);
WingInsetRight = new ModelRenderer(this, 6, 21);
WingInsetRight.addBox(0F, 0F, -1F, 1, 9, 2);
WingInsetRight.setRotationPoint(-0.504F, 0F, 7.8F);
setRotation(WingInsetRight, 0.3490659F, 0F, 0F);
WingCenterRight = new ModelRenderer(this, 12, 53);
WingCenterRight = new ModelRenderer(this, 12, 21);
WingCenterRight.addBox(0F, 0F, -1F, 1, 9, 2);
WingCenterRight.setRotationPoint(-0.506F, 0.3F, 6.3F);
setRotation(WingCenterRight, 0.1745329F, 0F, 0F);
WingFlangeRight = new ModelRenderer(this, 18, 53);
WingFlangeRight = new ModelRenderer(this, 18, 21);
WingFlangeRight.addBox(0F, 0F, -1F, 1, 8, 2);
WingFlangeRight.setRotationPoint(-0.508F, 0.3F, 5.1F);
setRotation(WingFlangeRight, 0F, 0F, 0F);
WingAuxRight = new ModelRenderer(this, 24, 53);
WingAuxRight = new ModelRenderer(this, 24, 21);
WingAuxRight.addBox(0F, 0F, -1F, 1, 7, 2);
WingAuxRight.setRotationPoint(-0.51F, 0.1F, 4F);
setRotation(WingAuxRight, -0.1745329F, 0F, 0F);
@@ -62,33 +63,33 @@ public class WingModel extends ModelBase
WingBaseRight.addChild(WingFlangeRight);
WingBaseRight.addChild(WingAuxRight);
// Left Wing
WingBaseLeft = new ModelRenderer(this, 42, 41);
//Left Wing
WingBaseLeft = new ModelRenderer(this, 42, 9);
WingBaseLeft.addBox(-0.5F, -1F, 0F, 1, 2, 10);
WingBaseLeft.setRotationPoint(1F, 1F, 0F);
setRotation(WingBaseLeft, 0.5235988F, 0.5235988F, 0F);
WingEdgeLeft = new ModelRenderer(this, 58, 53);
WingEdgeLeft = new ModelRenderer(this, 58, 21);
WingEdgeLeft.addBox(0F, 0F, -2F, 1, 9, 2);
WingEdgeLeft.setRotationPoint(-0.502F, -1F, 10F);
setRotation(WingEdgeLeft, 0.5235988F, 0F, 0F);
WingInsetLeft = new ModelRenderer(this, 52, 53);
WingInsetLeft = new ModelRenderer(this, 52, 21);
WingInsetLeft.addBox(0F, 0F, -1F, 1, 9, 2);
WingInsetLeft.setRotationPoint(-0.504F, 0F, 7.8F);
setRotation(WingInsetLeft, 0.3490659F, 0F, 0F);
WingCenterLeft = new ModelRenderer(this, 46, 53);
WingCenterLeft = new ModelRenderer(this, 46, 21);
WingCenterLeft.addBox(0F, 0F, -1F, 1, 9, 2);
WingCenterLeft.setRotationPoint(-0.506F, 0.3F, 6.3F);
setRotation(WingCenterLeft, 0.1745329F, 0F, 0F);
WingFlangeLeft = new ModelRenderer(this, 40, 53);
WingFlangeLeft = new ModelRenderer(this, 40, 21);
WingFlangeLeft.addBox(0F, 0F, -1F, 1, 8, 2);
WingFlangeLeft.setRotationPoint(-0.508F, 0.3F, 5.1F);
setRotation(WingFlangeLeft, 0F, 0F, 0F);
WingAuxLeft = new ModelRenderer(this, 34, 53);
WingAuxLeft = new ModelRenderer(this, 34, 21);
WingAuxLeft.addBox(0F, 0F, -1F, 1, 7, 2);
WingAuxLeft.setRotationPoint(-0.51F, 0.1F, 4F);
setRotation(WingAuxLeft, -0.1745329F, 0F, 0F);
@@ -98,9 +99,17 @@ public class WingModel extends ModelBase
WingBaseLeft.addChild(WingCenterLeft);
WingBaseLeft.addChild(WingFlangeLeft);
WingBaseLeft.addChild(WingAuxLeft);
this.bipedCloak.isHidden = true;
this.bipedEars.isHidden = true;
this.bipedHead.isHidden = true;
this.bipedHeadwear.isHidden = true;
this.bipedRightArm.isHidden = true;
this.bipedLeftArm.isHidden = true;
this.bipedRightLeg.isHidden = true;
this.bipedLeftLeg.isHidden = true;
}
@Override
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);
@@ -116,10 +125,72 @@ public class WingModel extends ModelBase
model.rotateAngleZ = z;
}
@Override
public void setRotationAngles (float f, float f1, float f2, float f3, float f4, float f5, Entity entity)
public void setRotationAngles (float f, float f1, float partialTick, float f3, float f4, float f5, Entity player)
{
super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
super.setRotationAngles(f, f1, partialTick, f3, f4, f5, player);
if (this.isRiding)
{
float slow = 17f;
this.WingBaseRight.rotateAngleX = MathHelper.sin(partialTick / slow) / 10f + 0.9F;
this.WingBaseRight.rotateAngleY = MathHelper.sin(partialTick / slow) / 5.0f - 0.7f;
this.WingBaseRight.rotateAngleZ = MathHelper.sin(partialTick / slow) / 2.5f - 0.3f;
this.WingBaseLeft.rotateAngleX = MathHelper.sin(partialTick / slow) / 10 + 0.9F;
this.WingBaseLeft.rotateAngleY = -MathHelper.sin(partialTick / slow) / 5.0f + 0.7f;
this.WingBaseLeft.rotateAngleZ = -MathHelper.sin(partialTick / slow) / 2.5f + 0.3f;
}
else if (player.isInWater())
{
float slow = 17f;
this.WingBaseRight.rotateAngleX = MathHelper.sin(partialTick / slow) / 15f + 0.5235988F;
this.WingBaseRight.rotateAngleY = MathHelper.sin(partialTick / slow) / 15f - 0.8f;
this.WingBaseRight.rotateAngleZ = MathHelper.sin(partialTick / slow) / 15f - 0.8f;
this.WingBaseLeft.rotateAngleX = MathHelper.sin(partialTick / slow) / 15f + 0.5235988F;
this.WingBaseLeft.rotateAngleY = -MathHelper.sin(partialTick / slow) / 15f + 0.8f;
this.WingBaseLeft.rotateAngleZ = -MathHelper.sin(partialTick / slow) / 15f + 0.8f;
}
else if (player.posY - player.prevPosY < 0f && player.fallDistance > 2.3)
{
float slow = 20f;
this.WingBaseRight.rotateAngleX = MathHelper.sin(partialTick / slow) / 15f + 0.7F;
this.WingBaseRight.rotateAngleY = MathHelper.sin(partialTick / slow) / 15f - 0.8f;
this.WingBaseRight.rotateAngleZ = MathHelper.sin(partialTick / slow) / 15f - 0.3f;
this.WingBaseLeft.rotateAngleX = MathHelper.sin(partialTick / slow) / 15f + 0.7F;
this.WingBaseLeft.rotateAngleY = -MathHelper.sin(partialTick / slow) / 15f + 0.8f;
this.WingBaseLeft.rotateAngleZ = -MathHelper.sin(partialTick / slow) / 15f + 0.3f;
}
else if (player.isSprinting() || this.onGround > 0)
{
float slow = 1.73f;
this.WingBaseRight.rotateAngleX = MathHelper.sin(partialTick / slow) / 15f + 0.5235988F;
this.WingBaseRight.rotateAngleY = MathHelper.sin(partialTick / slow) / 15f - 0.6f;
this.WingBaseRight.rotateAngleZ = MathHelper.sin(partialTick / slow) / 15f - 0.3f;
this.WingBaseLeft.rotateAngleX = MathHelper.sin(partialTick / slow) / 15f + 0.5235988F;
this.WingBaseLeft.rotateAngleY = -MathHelper.sin(partialTick / slow) / 15f + 0.6f;
this.WingBaseLeft.rotateAngleZ = -MathHelper.sin(partialTick / slow) / 15f + 0.3f;
}
else
{
float slow = 17f;
if (player.motionX != 0 || player.motionZ != 0)
slow = 6f;
this.WingBaseRight.rotateAngleX = MathHelper.sin(partialTick / slow) / 5f + 0.5235988F;
this.WingBaseRight.rotateAngleY = MathHelper.sin(partialTick / slow) / 3.0f - 0.6f;
this.WingBaseRight.rotateAngleZ = MathHelper.sin(partialTick / slow) / 1.5f - 0.3f;
this.WingBaseLeft.rotateAngleX = MathHelper.sin(partialTick / slow) / 5f + 0.5235988F;
this.WingBaseLeft.rotateAngleY = -MathHelper.sin(partialTick / slow) / 3.0f + 0.6f;
this.WingBaseLeft.rotateAngleZ = -MathHelper.sin(partialTick / slow) / 1.5f + 0.3f;
}
if (this.isSneak)
{
this.WingBaseRight.rotateAngleX += 0.4f;
this.WingBaseLeft.rotateAngleX += 0.4f;
}
}
}