PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-18 02:24:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

1.15.1 -> 1.15.2

Browse source
This commit is contained in:
Sollace 2020-01-28 16:24:04 +02:00
parent 274d13a34b
commit 28f78f974b
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gradle.properties
View file

@ -3,9 +3,9 @@ org.gradle.daemon=false
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
minecraft_version=1.15.1 minecraft_version=1.15.2
yarn_mappings=1.15.1+build.26:v2 yarn_mappings=1.15.2+build.7:v2
loader_version=0.7.3+build.176 loader_version=0.7.6+build.180
# Mod Properties # Mod Properties
group=com.minelittlepony group=com.minelittlepony
@ -17,6 +17,6 @@ org.gradle.daemon=false
# Dependencies # Dependencies
modmenu_version=1.8.+ modmenu_version=1.8.+
kirin_version=1.5.1-1.15.1-SNAPSHOT kirin_version=1.5.2-1.15.2-SNAPSHOT
hd_skins_version=6.1-1.15.1-SNAPSHOT hd_skins_version=6.1-1.15.2-SNAPSHOT
mson_version=1.1.8-1.15.1-SNAPSHOT mson_version=1.1.8-1.15.2-SNAPSHOT

4
src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java
View file

@ -79,12 +79,12 @@ public class SeaponyModel<T extends LivingEntity> extends UnicornModel<T> {
centerFin.roll = flapMotion; centerFin.roll = flapMotion;
} }
if (!entity.isInWater()) { if (!entity.isSubmergedInWater()) {
leftArm.pitch -= 0.5F; leftArm.pitch -= 0.5F;
rightArm.pitch -= 0.5F; rightArm.pitch -= 0.5F;
} }
if (!entity.isInWater() || entity.onGround) { if (!entity.isSubmergedInWater() || entity.onGround) {
leftArm.yaw -= 0.5F; leftArm.yaw -= 0.5F;
rightArm.yaw += 0.5F; rightArm.yaw += 0.5F;
} }

6
src/main/java/com/minelittlepony/client/pony/Pony.java
View file

@ -76,7 +76,7 @@ public class Pony implements IPony {
return !(isOnGround(entity) return !(isOnGround(entity)
|| entity.hasVehicle() || entity.hasVehicle()
|| (entity.isClimbing() && !(entity instanceof PlayerEntity && ((PlayerEntity)entity).abilities.allowFlying)) || (entity.isClimbing() && !(entity instanceof PlayerEntity && ((PlayerEntity)entity).abilities.allowFlying))
|| entity.isInWater() || entity.isSubmergedInWater()
|| entity.isSleeping()); || entity.isSleeping());
} }
@ -111,13 +111,13 @@ public class Pony implements IPony {
@Override @Override
public boolean isPartiallySubmerged(LivingEntity entity) { public boolean isPartiallySubmerged(LivingEntity entity) {
return entity.isInWater() return entity.isSubmergedInWater()
|| entity.getEntityWorld().getBlockState(entity.getBlockPos()).getMaterial() == Material.WATER; || entity.getEntityWorld().getBlockState(entity.getBlockPos()).getMaterial() == Material.WATER;
} }
@Override @Override
public boolean isFullySubmerged(LivingEntity entity) { public boolean isFullySubmerged(LivingEntity entity) {
return entity.isInWater() return entity.isSubmergedInWater()
&& entity.getEntityWorld().getBlockState(new BlockPos(getVisualEyePosition(entity))).getMaterial() == Material.WATER; && entity.getEntityWorld().getBlockState(new BlockPos(getVisualEyePosition(entity))).getMaterial() == Material.WATER;
} }

2
src/main/java/com/minelittlepony/client/render/entity/npc/IllagerPonyRenderer.java
View file

@ -96,7 +96,7 @@ public abstract class IllagerPonyRenderer<T extends IllagerEntity> extends PonyR
} }
@Override @Override
protected boolean method_4056(IllusionerEntity entity, boolean xray) { protected boolean method_4056(IllusionerEntity entity) {
return true; return true;
} }
} }