Fix getUUID issue. Fix #78 #77

tr7zw · Nov 15, 2024 · b758f8e · b758f8e
1 parent 838e72d
commit b758f8e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
           java-version: 21
       # to cache gradle files
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
         with:
           gradle-home-cache-cleanup: true
           dependency-graph: generate-and-submit

diff --git a/WCVersionless/src/main/java/dev/tr7zw/waveycapes/versionless/CapeHolder.java b/WCVersionless/src/main/java/dev/tr7zw/waveycapes/versionless/CapeHolder.java
@@ -20,7 +20,7 @@ public interface CapeHolder {
 
     public void setSimulation(BasicSimulation sim);
 
-    UUID getUUID();
+    UUID getWCUUID();
 
     void setDirty();
 

diff --git a/src/main/java/dev/tr7zw/waveycapes/mixin/PlayerMixin.java b/src/main/java/dev/tr7zw/waveycapes/mixin/PlayerMixin.java
@@ -3,6 +3,9 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.Level;
+
+import java.util.UUID;
+
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -60,4 +63,9 @@ private void moveCloakUpdate(CallbackInfo info) {
         }
     }
 
+    @Override
+    public UUID getWCUUID() {
+        return getUUID();
+    }
+
 }
diff --git a/src/main/java/dev/tr7zw/waveycapes/support/EarsSupport.java b/src/main/java/dev/tr7zw/waveycapes/support/EarsSupport.java
@@ -35,7 +35,7 @@ public EarsSupport() {
 
     @Override
     public boolean shouldBeUsed(CapeRenderInfo capeRenderInfo) {
-        EarsFeatures playerFeatures = EarsFeatures.getById(capeRenderInfo.getCapeHolder().getUUID());
+        EarsFeatures playerFeatures = EarsFeatures.getById(capeRenderInfo.getCapeHolder().getWCUUID());
         return playerFeatures != null && playerFeatures.capeEnabled;
     }
 
@@ -54,7 +54,7 @@ private class EarsRenderer implements CapeRenderer {
         @Override
         public void render(CapeRenderInfo capeRenderInfo, int part, ModelPart model, PoseStack poseStack,
                 MultiBufferSource multiBufferSource, int light, int overlay) {
-            EarsFeatures playerFeatures = EarsFeatures.getById(capeRenderInfo.getCapeHolder().getUUID());
+            EarsFeatures playerFeatures = EarsFeatures.getById(capeRenderInfo.getCapeHolder().getWCUUID());
 
             VertexConsumer vertexConsumer = null;
             if (playerFeatures != null && playerFeatures.capeEnabled) {

diff --git a/src/main/java/dev/tr7zw/waveycapes/support/MinecraftCapesSupport.java b/src/main/java/dev/tr7zw/waveycapes/support/MinecraftCapesSupport.java
@@ -28,8 +28,8 @@ public class MinecraftCapesSupport implements ModSupport {
 
     private void init(CapeRenderInfo test) {
         try {
-            PlayerHandler.get(test.getCapeHolder().getUUID()).getCapeLocation();
-            getCape = player -> PlayerHandler.get(player.getCapeHolder().getUUID());
+            PlayerHandler.get(test.getCapeHolder().getWCUUID()).getCapeLocation();
+            getCape = player -> PlayerHandler.get(player.getCapeHolder().getWCUUID());
             ModBase.LOGGER.info("Using 'get(UUID)' method for MinecraftCapes.");
             return;
         } catch (Throwable ex) {