Skip to content

Commit

Permalink
Ported to 1.15.2
Browse files Browse the repository at this point in the history
Updated mappings
  • Loading branch information
GirafiStudios committed Jan 27, 2020
1 parent c7ee60c commit 9a6542d
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
minecraft_version=1.15.1
forge_version=30.0.15
mappings=20191221-1.14.3
mod_version=0.8.4
minecraft_version=1.15.2
forge_version=31.0.1
mappings=20200127-1.15.1
mod_version=0.8.5

org.gradle.jvmargs=-Xmx4G
org.gradle.daemon=false
22 changes: 11 additions & 11 deletions src/main/java/com/girafi/waddles/client/model/PenguinModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,35 +27,35 @@ public PenguinModel() {
this.textureHeight = 32;
this.beak = new ModelRenderer(this, 18, 0);
this.beak.setRotationPoint(0.0F, 0.0F, 0.0F);
this.beak.func_228301_a_(-0.5F, -3.0F, -4.0F, 1, 2, 3, 0.0F);
this.beak.addBox(-0.5F, -3.0F, -4.0F, 1, 2, 3, 0.0F);
this.setRotateAngle(beak, 0.08726646259971647F, -0.0F, 0.0F);
this.body = new ModelRenderer(this, 0, 9);
this.body.setRotationPoint(0.0F, 12.0F, 1.0F);
this.body.func_228301_a_(-2.5F, 0.0F, -2.0F, 5, 11, 5, 0.0F);
this.body.addBox(-2.5F, 0.0F, -2.0F, 5, 11, 5, 0.0F);
this.feetRight = new ModelRenderer(this, 0, 25);
this.feetRight.setRotationPoint(-1.0F, 11.0F, 0.0F);
this.feetRight.func_228301_a_(-2.0F, 0.0F, -3.0F, 2, 1, 3, 0.0F);
this.feetRight.addBox(-2.0F, 0.0F, -3.0F, 2, 1, 3, 0.0F);
this.setRotateAngle(feetRight, 0.0F, 0.2617993877991494F, 0.0F);
this.head = new ModelRenderer(this, 0, 0);
this.head.setRotationPoint(0.0F, 12.0F, 0.0F);
this.head.func_228301_a_(-2.0F, -4.0F, -2.0F, 4, 4, 5, 0.0F);
this.head.addBox(-2.0F, -4.0F, -2.0F, 4, 4, 5, 0.0F);
this.tail = new ModelRenderer(this, 20, 20);
this.tail.setRotationPoint(0.0F, 11.0F, 3.0F);
this.tail.func_228301_a_(-1.5F, -1.0F, 0.0F, 3, 3, 1, 0.0F);
this.tail.addBox(-1.5F, -1.0F, 0.0F, 3, 3, 1, 0.0F);
this.setRotateAngle(tail, 1.2566370614359172F, 0.0F, 0.0F);
this.flipperRight = new ModelRenderer(this, 20, 10);
this.flipperRight.setRotationPoint(-2.5F, 1.0F, 0.0F);
this.flipperRight.func_228301_a_(-1.0F, 0.0F, -1.0F, 1, 7, 3, 0.0F);
this.flipperRight.addBox(-1.0F, 0.0F, -1.0F, 1, 7, 3, 0.0F);
this.setRotateAngle(flipperRight, 0.0F, 0.0F, 0.08726646259971647F);
this.feetLeft = new ModelRenderer(this, 0, 25);
this.feetLeft.mirror = true;
this.feetLeft.setRotationPoint(1.0F, 11.0F, 0.0F);
this.feetLeft.func_228301_a_(0.0F, 0.0F, -3.0F, 2, 1, 3, 0.0F);
this.feetLeft.addBox(0.0F, 0.0F, -3.0F, 2, 1, 3, 0.0F);
this.setRotateAngle(feetLeft, 0.0F, -0.2617993877991494F, 0.0F);
this.flipperLeft = new ModelRenderer(this, 20, 10);
this.flipperLeft.mirror = true;
this.flipperLeft.setRotationPoint(2.5F, 1.0F, 0.0F);
this.flipperLeft.func_228301_a_(0.0F, 0.0F, -1.0F, 1, 7, 3, 0.0F);
this.flipperLeft.addBox(0.0F, 0.0F, -1.0F, 1, 7, 3, 0.0F);
this.setRotateAngle(flipperLeft, 0.0F, 0.0F, -0.08726646259971647F);
this.head.addChild(this.beak);
this.body.addChild(this.feetRight);
Expand All @@ -67,13 +67,13 @@ public PenguinModel() {

@Override
@Nonnull
protected Iterable<ModelRenderer> func_225602_a_() {
protected Iterable<ModelRenderer> getHeadParts() {
return ImmutableList.of(this.head);
}

@Override
@Nonnull
protected Iterable<ModelRenderer> func_225600_b_() {
protected Iterable<ModelRenderer> getBodyParts() {
return ImmutableList.of(this.body);
}

Expand All @@ -84,7 +84,7 @@ private void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float
}

@Override
public void func_225597_a_(@Nonnull EntityAdeliePenguin penguin, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) {
public void render(@Nonnull EntityAdeliePenguin penguin, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) {
this.head.rotateAngleX = headPitch * 0.017453292F;
this.head.rotateAngleY = netHeadYaw * 0.017453292F;
this.head.rotateAngleZ = (MathHelper.cos(limbSwing * 1.3324F) * 1.4F * limbSwingAmount) / 6;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ protected SoundEvent getDeathSound() {
public void livingTick() {
super.livingTick();
if (this.world.isRemote) {
if (this.func_226277_ct_() != this.prevPosZ) {
if (this.getPosX() != this.prevPosZ) {
if (this.moveFlipper) {
this.rotationFlipper++;
}
Expand Down

0 comments on commit 9a6542d

Please sign in to comment.