From 28f78f974b488787d855f6f38aadb26a6d43668d Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Tue, 28 Jan 2020 16:24:04 +0200
Subject: [PATCH] 1.15.1 -> 1.15.2

---
 gradle.properties                                    | 12 ++++++------
 .../client/model/entity/race/SeaponyModel.java       |  4 ++--
 .../java/com/minelittlepony/client/pony/Pony.java    |  6 +++---
 .../render/entity/npc/IllagerPonyRenderer.java       |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 41727966..91ec270e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,9 +3,9 @@ org.gradle.daemon=false
 
 # Fabric Properties
   # check these on https://fabricmc.net/use
-  minecraft_version=1.15.1
-  yarn_mappings=1.15.1+build.26:v2
-  loader_version=0.7.3+build.176
+  minecraft_version=1.15.2
+  yarn_mappings=1.15.2+build.7:v2
+  loader_version=0.7.6+build.180
 
 # Mod Properties
   group=com.minelittlepony
@@ -17,6 +17,6 @@ org.gradle.daemon=false
 
 # Dependencies
   modmenu_version=1.8.+
-  kirin_version=1.5.1-1.15.1-SNAPSHOT
-  hd_skins_version=6.1-1.15.1-SNAPSHOT
-  mson_version=1.1.8-1.15.1-SNAPSHOT
+  kirin_version=1.5.2-1.15.2-SNAPSHOT
+  hd_skins_version=6.1-1.15.2-SNAPSHOT
+  mson_version=1.1.8-1.15.2-SNAPSHOT
diff --git a/src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java b/src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java
index fc86825a..0f126a49 100644
--- a/src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java
+++ b/src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java
@@ -79,12 +79,12 @@ public class SeaponyModel<T extends LivingEntity> extends UnicornModel<T> {
             centerFin.roll = flapMotion;
         }
 
-        if (!entity.isInWater()) {
+        if (!entity.isSubmergedInWater()) {
             leftArm.pitch -= 0.5F;
             rightArm.pitch -= 0.5F;
         }
 
-        if (!entity.isInWater() || entity.onGround) {
+        if (!entity.isSubmergedInWater() || entity.onGround) {
             leftArm.yaw -= 0.5F;
             rightArm.yaw += 0.5F;
         }
diff --git a/src/main/java/com/minelittlepony/client/pony/Pony.java b/src/main/java/com/minelittlepony/client/pony/Pony.java
index 772f28b0..c2772a43 100644
--- a/src/main/java/com/minelittlepony/client/pony/Pony.java
+++ b/src/main/java/com/minelittlepony/client/pony/Pony.java
@@ -76,7 +76,7 @@ public class Pony implements IPony {
         return !(isOnGround(entity)
                 || entity.hasVehicle()
                 || (entity.isClimbing() && !(entity instanceof PlayerEntity && ((PlayerEntity)entity).abilities.allowFlying))
-                || entity.isInWater()
+                || entity.isSubmergedInWater()
                 || entity.isSleeping());
     }
 
@@ -111,13 +111,13 @@ public class Pony implements IPony {
 
     @Override
     public boolean isPartiallySubmerged(LivingEntity entity) {
-        return entity.isInWater()
+        return entity.isSubmergedInWater()
                 || entity.getEntityWorld().getBlockState(entity.getBlockPos()).getMaterial() == Material.WATER;
     }
 
     @Override
     public boolean isFullySubmerged(LivingEntity entity) {
-        return entity.isInWater()
+        return entity.isSubmergedInWater()
                 && entity.getEntityWorld().getBlockState(new BlockPos(getVisualEyePosition(entity))).getMaterial() == Material.WATER;
     }
 
diff --git a/src/main/java/com/minelittlepony/client/render/entity/npc/IllagerPonyRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/npc/IllagerPonyRenderer.java
index 2faf0a1b..8268e81e 100644
--- a/src/main/java/com/minelittlepony/client/render/entity/npc/IllagerPonyRenderer.java
+++ b/src/main/java/com/minelittlepony/client/render/entity/npc/IllagerPonyRenderer.java
@@ -96,7 +96,7 @@ public abstract class IllagerPonyRenderer<T extends IllagerEntity> extends PonyR
         }
 
         @Override
-        protected boolean method_4056(IllusionerEntity entity, boolean xray) {
+        protected boolean method_4056(IllusionerEntity entity) {
             return true;
         }
     }