PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-28 23:17:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed pony body parts appearing on players in spectator mode and possily invisible players/mobs

Browse source
This commit is contained in:
Sollace 2019-08-18 15:53:15 +02:00
parent e27fd49c40
commit 3a094fe1bf
8 changed files with 55 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java
View file

@ -11,7 +11,6 @@ import com.minelittlepony.client.util.render.plane.PlaneRenderer;
import com.minelittlepony.model.BodyPart;
import com.minelittlepony.model.IPart;
import com.minelittlepony.model.armour.IEquestrianArmour;
import net.minecraft.client.model.Cuboid;
import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
@ -767,8 +766,10 @@ public abstract class AbstractPonyModel<T extends LivingEntity> extends ClientPo
protected void renderVest(float scale) {
bodyOverlay.render(scale);
if (bodyOverlay.visible) {
upperTorsoOverlay.render(scale);
}
}
protected void renderLegs(float scale) {
if (!isSneaking) {
@ -788,6 +789,18 @@ public abstract class AbstractPonyModel<T extends LivingEntity> extends ClientPo
rightLegOverlay.render(scale);
}
@Override
public void setVisible(boolean visible) {
super.setVisible(visible);
upperTorso.visible = visible;
upperTorsoOverlay.visible = visible;
neck.visible = visible;
tail.setVisible(visible);
}
@Override
public void transform(BodyPart part) {
if (attributes.isSleeping) {

3
src/main/java/com/minelittlepony/client/model/components/PegasusWings.java
View file

@ -6,13 +6,12 @@ import net.minecraft.util.math.MathHelper;
import com.minelittlepony.client.util.render.PonyRenderer;
import com.minelittlepony.model.IPart;
import com.minelittlepony.model.IPegasus;
import com.minelittlepony.model.PonyModelConstants;
import com.minelittlepony.pony.meta.Wearable;
import com.mojang.blaze3d.platform.GlStateManager;
import java.util.UUID;
public class PegasusWings<T extends Model & IPegasus> implements IPart, PonyModelConstants {
public class PegasusWings<T extends Model & IPegasus> implements IPart {
protected final T pegasus;

8
src/main/java/com/minelittlepony/client/model/entities/ModelEnderStallion.java
View file

@ -127,6 +127,14 @@ public class ModelEnderStallion extends ModelSkeletonPony<EndermanEntity> {
rightLeg = new Cuboid(this, 0, 20);
}
@Override
public void setVisible(boolean visible) {
super.setVisible(visible);
leftHorn.visible = visible;
rightHorn.visible = visible;
}
@Override
public boolean wingsAreOpen() {
return isAttacking;

6
src/main/java/com/minelittlepony/client/model/entities/ModelSeapony.java
View file

@ -185,6 +185,12 @@ public class ModelSeapony<T extends LivingEntity> extends ModelUnicorn<T> {
rightLeg.visible = false;
leftLegOverlay.visible = false;
rightLegOverlay.visible = false;
bodyCenter.visible = visible;
leftFin.visible = visible;
centerFin.visible = visible;
rightFin.visible = visible;
}
class Armour extends ModelPonyArmour<T> {

6
src/main/java/com/minelittlepony/client/model/races/ModelAlicorn.java
View file

@ -40,4 +40,10 @@ public class ModelAlicorn<T extends LivingEntity> extends ModelUnicorn<T> implem
wings.renderPart(scale, attributes.interpolatorId);
}
}
@Override
public void setVisible(boolean visible) {
super.setVisible(visible);
wings.setVisible(visible);
}
}

6
src/main/java/com/minelittlepony/client/model/races/ModelPegasus.java
View file

@ -34,4 +34,10 @@ public class ModelPegasus<T extends LivingEntity> extends ModelEarthPony<T> impl
super.renderBody(scale);
wings.renderPart(scale, attributes.interpolatorId);
}
@Override
public void setVisible(boolean visible) {
super.setVisible(visible);
wings.setVisible(visible);
}
}

6
src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java
View file

@ -125,4 +125,10 @@ public class ModelUnicorn<T extends LivingEntity> extends ModelEarthPony<T> impl
}
return super.getArm(side);
}
@Override
public void setVisible(boolean visible) {
super.setVisible(visible);
horn.setVisible(visible);
}
}

7
src/main/java/com/minelittlepony/client/model/races/ModelZebra.java
View file

@ -51,6 +51,13 @@ public class ModelZebra<T extends LivingEntity> extends ModelEarthPony<T> {
.pitch = -1F;
}
@Override
public void setVisible(boolean visible) {
super.setVisible(visible);
bristles.visible = visible;
}
class Armour extends ModelPonyArmour<T> {
@Override