Skip to content

Commit 873c4ea

Browse files
committed
updated code format
1 parent 3f96f63 commit 873c4ea

5 files changed

Lines changed: 197 additions & 441 deletions

File tree

src/main/java/com/crowsofwar/avatar/client/render/ModelLemur.java

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -831,16 +831,14 @@ public ModelLemur() {
831831
public void render(Entity entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
832832
super.render(entityIn, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale);
833833

834-
if (this.isChild)
835-
{
834+
if (this.isChild) {
836835
GL11.glPushMatrix();
837836
GL11.glTranslatef(0F, 1.5F-1.5F*0.35F, 0F);
838837
GL11.glScalef(0.35F, 0.35F, 0.35F);
839838
this.Body.render(scale);
840839
GL11.glPopMatrix();
841840
}
842-
else
843-
{
841+
else {
844842
GL11.glPushMatrix();
845843
GL11.glTranslatef(0F, 1.5F-1.5F*0.5F, 0F);
846844
GL11.glScalef(0.5F, 0.5F, 0.5F);
@@ -855,8 +853,7 @@ public void setRotateAngle(ModelRenderer ModelRenderer, float x, float y, float
855853
ModelRenderer.rotateAngleZ = z;
856854
}
857855

858-
public void setLivingAnimations(EntityLivingBase entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTickTime)
859-
{
856+
public void setLivingAnimations(EntityLivingBase entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTickTime) {
860857

861858
/*
862859
this.Left_Wing.setScale(0, 0, 0);
@@ -868,8 +865,8 @@ public void setLivingAnimations(EntityLivingBase entitylivingbaseIn, float limbS
868865

869866
boolean gliding = GliderHelper.getIsGliderDeployed((EntityPlayer) lemur.getOwner());
870867

871-
if (lemur.isPartying())
872-
{
868+
if (lemur.isPartying()) {
869+
873870
this.state = State.PARTY;
874871
//TODO
875872
this.Body.rotateAngleY = -1.5F;
@@ -1197,8 +1194,7 @@ else if (lemur.speed > 0.1F && lemur.speed < 0.25F && !lemur.isLemurRiding())
11971194

11981195
EntityAscendedFlyingLemur lemur = (EntityAscendedFlyingLemur)entitylivingbaseIn;
11991196

1200-
if (lemur.isPartying())
1201-
{
1197+
if (lemur.isPartying()) {
12021198
this.state = State.PARTY;
12031199
//TODO
12041200
this.Body.rotateAngleY = -1.5F;
@@ -1536,13 +1532,9 @@ public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageI
15361532
this.ArmRight.rotateAngleX = MathHelper.cos(limbSwing * 0.6662F) * 1.4F * limbSwingAmount;
15371533

15381534
}
1539-
private float triangleWave(float p_78172_1_, float p_78172_2_)
1540-
{
1541-
return (Math.abs(p_78172_1_ % p_78172_2_ - p_78172_2_ * 0.5F) - p_78172_2_ * 0.25F) / (p_78172_2_ * 0.25F);
1542-
}
1535+
15431536
@SideOnly(Side.CLIENT)
1544-
static enum State
1545-
{
1537+
static enum State {
15461538
FLYING,
15471539
SPRINTING,
15481540
SITTING,

src/main/java/com/crowsofwar/avatar/client/render/ModelLlibraryLemur.java

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -860,8 +860,7 @@ public void setRotateAngle(AdvancedModelRenderer AdvancedAdvancedModelRenderer,
860860
AdvancedAdvancedModelRenderer.rotateAngleZ = z;
861861
}
862862

863-
public void setLivingAnimations(EntityLivingBase entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTickTime)
864-
{
863+
public void setLivingAnimations(EntityLivingBase entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTickTime) {
865864
this.resetToDefaultPose();
866865

867866
this.Left_Wing.setScale(0, 0, 0);
@@ -875,8 +874,7 @@ public void setLivingAnimations(EntityLivingBase entitylivingbaseIn, float limbS
875874
gliding = GliderHelper.getIsGliderDeployed((EntityPlayer) lemur.getOwner());
876875
}
877876

878-
if (lemur.isPartying())
879-
{
877+
if (lemur.isPartying()) {
880878
this.state = ModelLlibraryLemur.State.PARTY;
881879
this.Body.rotateAngleY = -1.5F;
882880
this.Body.rotateAngleX = 0.3F;
@@ -1203,8 +1201,7 @@ else if (lemur.isFlying() && !lemur.isLemurRiding())
12031201
gliding = GliderHelper.getIsGliderDeployed((EntityPlayer) lemur.getOwner());
12041202
}
12051203

1206-
if (lemur.isPartying())
1207-
{
1204+
if (lemur.isPartying()) {
12081205
this.state = ModelLlibraryLemur.State.PARTY;
12091206
this.Body.rotateAngleY = -1.5F;
12101207
this.Body.rotateAngleX = 0.3F;
@@ -1738,13 +1735,9 @@ else if(this.state == State.PARTY) { //RIGHT
17381735

17391736

17401737
}
1741-
private float triangleWave(float p_78172_1_, float p_78172_2_)
1742-
{
1743-
return (Math.abs(p_78172_1_ % p_78172_2_ - p_78172_2_ * 0.5F) - p_78172_2_ * 0.25F) / (p_78172_2_ * 0.25F);
1744-
}
1738+
17451739
@SideOnly(Side.CLIENT)
1746-
static enum State
1747-
{
1740+
static enum State {
17481741
FLYING,
17491742
SPRINTING,
17501743
SITTING,

0 commit comments

Comments
 (0)