Leahnaya/FairyFactions
1
0
Fork 0
mirror of https://github.com/allaryin/FairyFactions.git synced 2026-04-25 08:04:06 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Models compile, now for Renderers... (39 errors, 31 warnings)

Browse Source
This commit is contained in:
Ammon Lauritzen 2016-03-02 14:04:55 -06:00
parent 160c9f32ae
commit 09ec242ac3
6 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/fairies/client/render/ModelFairy.java
View File

@ -182,9 +182,9 @@ public class ModelFairy extends ModelBiped
bipedRightArm.rotateAngleY = 0.0F;
bipedLeftArm.rotateAngleY = 0.0F;
if (onGround > -9990F)
if (swingProgress > -9990F)
{
float f6 = onGround;
float f6 = swingProgress;
bipedBody.rotateAngleY = MathHelper.sin(MathHelper.sqrt_float(f6) * (float)Math.PI * 2.0F) * 0.2F;
wingLeft.rotateAngleY = wingRight.rotateAngleY = MathHelper.sin(MathHelper.sqrt_float(f6) * (float)Math.PI * 2.0F) * 0.2F;
bipedRightArm.rotationPointZ = MathHelper.sin(bipedBody.rotateAngleY) * 5F;
@ -194,15 +194,15 @@ public class ModelFairy extends ModelBiped
bipedRightArm.rotateAngleY += bipedBody.rotateAngleY;
bipedLeftArm.rotateAngleY += bipedBody.rotateAngleY;
bipedLeftArm.rotateAngleX += bipedBody.rotateAngleY;
f6 = 1.0F - onGround;
f6 = 1.0F - swingProgress;
f6 *= f6;
f6 *= f6;
f6 = 1.0F - f6;
final float f8 = MathHelper.sin(f6 * (float)Math.PI);
final float f9 = MathHelper.sin(onGround * (float)Math.PI) * -(bipedHead.rotateAngleX - 0.7F) * 0.75F;
final float f9 = MathHelper.sin(swingProgress * (float)Math.PI) * -(bipedHead.rotateAngleX - 0.7F) * 0.75F;
bipedRightArm.rotateAngleX -= f8 * 1.2D + f9;
bipedRightArm.rotateAngleY += bipedBody.rotateAngleY * 2.0F;
bipedRightArm.rotateAngleZ = MathHelper.sin(onGround * (float)Math.PI) * -0.4F;
bipedRightArm.rotateAngleZ = MathHelper.sin(swingProgress * (float)Math.PI) * -0.4F;
}
if (flymode)
@ -309,6 +309,9 @@ public class ModelFairy extends ModelBiped
wingRight.rotateAngleZ -= Math.cos(sinage) / (flymode ? 3F : 8F);
}
/*
* NOTE: Apparently removed in 1.8
*
@Override
public void renderEars(final float f)
{
@ -318,6 +321,7 @@ public class ModelFairy extends ModelBiped
public void renderCloak(final float f)
{
}
*/
public ModelRenderer strand, strand2, strand3, strand4;
public ModelRenderer crown;

4
src/main/java/fairies/client/render/ModelFairyEyes.java
View File

@ -51,6 +51,9 @@ public class ModelFairyEyes extends ModelBiped
}
}
/*
* NOTE: These are apparently removed in 1.8?
*
@Override
public void renderEars(final float f)
{
@ -60,6 +63,7 @@ public class ModelFairyEyes extends ModelBiped
public void renderCloak(final float f)
{
}
*/
public boolean flymode;
}

28
src/main/java/fairies/client/render/ModelFairyProps.java
View File

@ -184,9 +184,9 @@ public class ModelFairyProps extends ModelBiped
bipedRightArm.rotateAngleY = 0.0F;
bipedLeftArm.rotateAngleY = 0.0F;
if (onGround > -9990F)
if (swingProgress > -9990F)
{
float f6 = onGround;
float f6 = swingProgress;
bipedBody.rotateAngleY = MathHelper.sin(MathHelper.sqrt_float(f6) * (float)Math.PI * 2.0F) * 0.2F;
bipedRightArm.rotationPointZ = MathHelper.sin(bipedBody.rotateAngleY) * 5F;
bipedRightArm.rotationPointX = -MathHelper.cos(bipedBody.rotateAngleY) * 5F + 2.0F;
@ -195,15 +195,15 @@ public class ModelFairyProps extends ModelBiped
bipedRightArm.rotateAngleY += bipedBody.rotateAngleY;
bipedLeftArm.rotateAngleY += bipedBody.rotateAngleY;
bipedLeftArm.rotateAngleX += bipedBody.rotateAngleY;
f6 = 1.0F - onGround;
f6 = 1.0F - swingProgress;
f6 *= f6;
f6 *= f6;
f6 = 1.0F - f6;
final float f8 = MathHelper.sin(f6 * (float)Math.PI);
final float f9 = MathHelper.sin(onGround * (float)Math.PI) * -(bipedHead.rotateAngleX - 0.7F) * 0.75F;
final float f9 = MathHelper.sin(swingProgress * (float)Math.PI) * -(bipedHead.rotateAngleX - 0.7F) * 0.75F;
bipedRightArm.rotateAngleX -= f8 * 1.2D + f9;
bipedRightArm.rotateAngleY += bipedBody.rotateAngleY * 2.0F;
bipedRightArm.rotateAngleZ = MathHelper.sin(onGround * (float)Math.PI) * -0.4F;
bipedRightArm.rotateAngleZ = MathHelper.sin(swingProgress * (float)Math.PI) * -0.4F;
}
if (flymode)
@ -324,9 +324,9 @@ public class ModelFairyProps extends ModelBiped
scoutRightArm.rotateAngleY = 0.0F;
scoutLeftArm.rotateAngleY = 0.0F;
if (onGround > -9990F)
if (swingProgress > -9990F)
{
float f6 = onGround;
float f6 = swingProgress;
scoutBody.rotateAngleY = MathHelper.sin(MathHelper.sqrt_float(f6) * (float)Math.PI * 2.0F) * 0.2F;
wingLeft.rotateAngleY = wingRight.rotateAngleY = MathHelper.sin(MathHelper.sqrt_float(f6) * (float)Math.PI * 2.0F) * 0.2F;
scoutRightArm.rotationPointZ = MathHelper.sin(scoutBody.rotateAngleY) * 5F;
@ -336,15 +336,15 @@ public class ModelFairyProps extends ModelBiped
scoutRightArm.rotateAngleY += scoutBody.rotateAngleY;
scoutLeftArm.rotateAngleY += scoutBody.rotateAngleY;
scoutLeftArm.rotateAngleX += scoutBody.rotateAngleY;
f6 = 1.0F - onGround;
f6 = 1.0F - swingProgress;
f6 *= f6;
f6 *= f6;
f6 = 1.0F - f6;
final float f8 = MathHelper.sin(f6 * (float)Math.PI);
final float f9 = MathHelper.sin(onGround * (float)Math.PI) * -(scoutHead.rotateAngleX - 0.7F) * 0.75F;
final float f9 = MathHelper.sin(swingProgress * (float)Math.PI) * -(scoutHead.rotateAngleX - 0.7F) * 0.75F;
scoutRightArm.rotateAngleX -= f8 * 1.2D + f9;
scoutRightArm.rotateAngleY += scoutBody.rotateAngleY * 2.0F;
scoutRightArm.rotateAngleZ = MathHelper.sin(onGround * (float)Math.PI) * -0.4F;
scoutRightArm.rotateAngleZ = MathHelper.sin(swingProgress * (float)Math.PI) * -0.4F;
}
if (flymode)
@ -448,9 +448,9 @@ public class ModelFairyProps extends ModelBiped
medicHead.rotateAngleY = f3 / (180F / (float)Math.PI);
medicHead.rotateAngleX = f4 / (180F / (float)Math.PI);
if (onGround > -9990F)
if (swingProgress > -9990F)
{
final float f6 = onGround;
final float f6 = swingProgress;
medicBody.rotateAngleY = MathHelper.sin(MathHelper.sqrt_float(f6) * (float)Math.PI * 2.0F) * 0.2F;
}
@ -471,6 +471,9 @@ public class ModelFairyProps extends ModelBiped
}
}
/*
* NOTE: These are apparently removed in 1.8
*
@Override
public void renderEars(final float f)
{
@ -480,6 +483,7 @@ public class ModelFairyProps extends ModelBiped
public void renderCloak(final float f)
{
}
*/
public ModelRenderer scoutHead;
public ModelRenderer scoutBody;

14
src/main/java/fairies/client/render/ModelFairyProps2.java
View File

@ -143,9 +143,9 @@ public class ModelFairyProps2 extends ModelBiped
rogueRightArm.rotateAngleY = 0.0F;
rogueLeftArm.rotateAngleY = 0.0F;
if (onGround > -9990F)
if (swingProgress > -9990F)
{
float f6 = onGround;
float f6 = swingProgress;
rogueBody.rotateAngleY = MathHelper.sin(MathHelper.sqrt_float(f6) * (float)Math.PI * 2.0F) * 0.2F;
wingLeft.rotateAngleY = wingRight.rotateAngleY = MathHelper.sin(MathHelper.sqrt_float(f6) * (float)Math.PI * 2.0F) * 0.2F;
rogueRightArm.rotationPointZ = MathHelper.sin(rogueBody.rotateAngleY) * 5F;
@ -155,15 +155,15 @@ public class ModelFairyProps2 extends ModelBiped
rogueRightArm.rotateAngleY += rogueBody.rotateAngleY;
rogueLeftArm.rotateAngleY += rogueBody.rotateAngleY;
rogueLeftArm.rotateAngleX += rogueBody.rotateAngleY;
f6 = 1.0F - onGround;
f6 = 1.0F - swingProgress;
f6 *= f6;
f6 *= f6;
f6 = 1.0F - f6;
final float f8 = MathHelper.sin(f6 * (float)Math.PI);
final float f9 = MathHelper.sin(onGround * (float)Math.PI) * -(rogueHead.rotateAngleX - 0.7F) * 0.75F;
final float f9 = MathHelper.sin(swingProgress * (float)Math.PI) * -(rogueHead.rotateAngleX - 0.7F) * 0.75F;
rogueRightArm.rotateAngleX -= f8 * 1.2D + f9;
rogueRightArm.rotateAngleY += rogueBody.rotateAngleY * 2.0F;
rogueRightArm.rotateAngleZ = MathHelper.sin(onGround * (float)Math.PI) * -0.4F;
rogueRightArm.rotateAngleZ = MathHelper.sin(swingProgress * (float)Math.PI) * -0.4F;
}
if (flymode)
@ -268,6 +268,9 @@ public class ModelFairyProps2 extends ModelBiped
rogueBlade1.rotationPointZ = rogueBlade2.rotationPointZ = rogueRightArm.rotationPointZ;
}
/*
* NOTE: These are apparently removed in 1.8
*
@Override
public void renderEars(final float f)
{
@ -277,6 +280,7 @@ public class ModelFairyProps2 extends ModelBiped
public void renderCloak(final float f)
{
}
*/
public ModelRenderer rogueHead;
public ModelRenderer rogueBody;

6
src/main/java/fairies/client/render/RenderFairy.java
View File

@ -154,7 +154,7 @@ public class RenderFairy extends RenderLiving<EntityFairy>
fairyModel4.showCrown = fairy.tamed() || fairy.queen();
fairyModel4.isSneak = fairy.isSneaking();
fairyModel4.scoutWings = fairy.scout();
fairyModel4.onGround = fairyModel.onGround;
fairyModel4.swingProgress = fairyModel.swingProgress;
fairyModel4.rogueParts = fairy.rogue();
fairyModel4.hairType = fairy.hairType();
GL11.glColor4f(0.7F, 0.7F, 0.7F, transp);
@ -192,7 +192,7 @@ public class RenderFairy extends RenderLiving<EntityFairy>
fairyModel5.retract = 0F;
fairyModel5.isSneak = fairy.isSneaking();
fairyModel5.sinage = fairy.sinage;
fairyModel5.onGround = fairyModel.onGround;
fairyModel5.swingProgress = fairyModel.swingProgress;
fairyModel5.venom = fairy.canHeal();
}
else
@ -203,7 +203,7 @@ public class RenderFairy extends RenderLiving<EntityFairy>
fairyModel2.jobType = fairy.getJob() - 1;
fairyModel2.isSneak = fairy.isSneaking();
fairyModel2.sinage = fairy.sinage;
fairyModel2.onGround = fairyModel.onGround;
fairyModel2.swingProgress = fairyModel.swingProgress;
}
return 1;

6
src/main/java/fairies/client/render/RenderFish.java
View File

@ -11,7 +11,7 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.Vec3;
public class RenderFish extends Render
public class RenderFish extends Render<FairyEntityFishHook>
{
protected static final ResourceLocation texture = new ResourceLocation("textures/particle/particles.png");
@ -27,7 +27,7 @@ public class RenderFish extends Render
byte var10 = 1;
byte var11 = 2;
this.bindTexture(texture);
Tessellator var12 = Tessellator.instance;
Tessellator var12 = Tessellator.getInstance();
float var13 = (float)(var10 * 8 + 0) / 128.0F;
float var14 = (float)(var10 * 8 + 8) / 128.0F;
float var15 = (float)(var11 * 8 + 0) / 128.0F;
@ -54,7 +54,7 @@ public class RenderFish extends Render
double var23 = (double)MathHelper.cos(var20);
float var25 = par1EntityFishHook.angler.getSwingProgress(par9);
float var26 = MathHelper.sin(MathHelper.sqrt_float(var25) * (float)Math.PI);
Vec3 var27 = Vec3.createVectorHelper(-0.5D, 0.03D, 0.8D);
Vec3 var27 = new Vec3(-0.5D, 0.03D, 0.8D);
var27.rotateAroundX(-(par1EntityFishHook.angler.prevRotationPitch + (par1EntityFishHook.angler.rotationPitch - par1EntityFishHook.angler.prevRotationPitch) * par9) * (float)Math.PI / 180.0F);
var27.rotateAroundY(-(par1EntityFishHook.angler.prevRotationYaw + (par1EntityFishHook.angler.rotationYaw - par1EntityFishHook.angler.prevRotationYaw) * par9) * (float)Math.PI / 180.0F);
var27.rotateAroundY(var26 * 0.5F);