Merge branch 'server-renderer' into 1.20.4

NiFeather · Feb 2, 2024 · 88a3e83 · 88a3e83
2 parents a06150a + 3e64dfd
commit 88a3e83
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/...ain/java/xiamomc/morph/backends/server/renderer/network/datawatcher/values/CatValues.java b/...ain/java/xiamomc/morph/backends/server/renderer/network/datawatcher/values/CatValues.java
@@ -9,7 +9,7 @@ public class CatValues extends TameableAnimalValues
     public final SingleValue<CatVariant> CAT_VARIANT = getSingle("cat_variant", BuiltInRegistries.CAT_VARIANT.getOrThrow(CatVariant.TABBY));
     public final SingleValue<Boolean> IS_LYING = getSingle("cat_is_lying", false);
     public final SingleValue<Boolean> RELAXED = getSingle("cat_relaxed", false);
-    public final SingleValue<Integer> COLLAR_COLOR = getSingle("cat_collar_color", 14);
+    public final SingleValue<Byte> COLLAR_COLOR = getSingle("cat_collar_color", (byte)14);
 
     public CatValues()
     {

diff --git a/...in/java/xiamomc/morph/backends/server/renderer/network/datawatcher/values/WolfValues.java b/...in/java/xiamomc/morph/backends/server/renderer/network/datawatcher/values/WolfValues.java
@@ -5,7 +5,7 @@
 public class WolfValues extends TameableAnimalValues
 {
     public final SingleValue<Boolean> BEGGING = getSingle("wolf_begging", false);
-    public final SingleValue<Integer> COLLAR_COLOR = getSingle("wolf_collar_color", 14);
+    public final SingleValue<Byte> COLLAR_COLOR = getSingle("wolf_collar_color", (byte)14);
     public final SingleValue<Integer> ANGER_TIME = getSingle("wolf_anger_time", 0);
 
     public WolfValues()

diff --git a/...xiamomc/morph/backends/server/renderer/network/datawatcher/watchers/types/CatWatcher.java b/...xiamomc/morph/backends/server/renderer/network/datawatcher/watchers/types/CatWatcher.java
@@ -75,7 +75,7 @@ public void mergeFromCompound(CompoundTag nbt)
         }
 
         if (nbt.contains("CollarColor"))
-            write(ValueIndex.CAT.COLLAR_COLOR, (int)nbt.getByte("CollarColor"));
+            write(ValueIndex.CAT.COLLAR_COLOR, nbt.getByte("CollarColor"));
     }
 
     @Override
@@ -87,6 +87,6 @@ public void writeToCompound(CompoundTag nbt)
         nbt.putString("variant", variant);
 
         var collarColor = get(ValueIndex.CAT.COLLAR_COLOR);
-        nbt.putInt("CollarColor", collarColor);
+        nbt.putByte("CollarColor", collarColor);
     }
 }
diff --git a/...iamomc/morph/backends/server/renderer/network/datawatcher/watchers/types/WolfWatcher.java b/...iamomc/morph/backends/server/renderer/network/datawatcher/watchers/types/WolfWatcher.java
@@ -26,14 +26,14 @@ public void mergeFromCompound(CompoundTag nbt)
         super.mergeFromCompound(nbt);
 
         if (nbt.contains("CollarColor"))
-            write(ValueIndex.WOLF.COLLAR_COLOR, (int)nbt.getByte("CollarColor"));
+            write(ValueIndex.WOLF.COLLAR_COLOR, nbt.getByte("CollarColor"));
     }
 
     @Override
     public void writeToCompound(CompoundTag nbt)
     {
         super.writeToCompound(nbt);
 
-        nbt.putByte("CollarColor", get(ValueIndex.WOLF.COLLAR_COLOR).byteValue());
+        nbt.putByte("CollarColor", get(ValueIndex.WOLF.COLLAR_COLOR));
     }
 }