Merge pull request #138 from tr7zw/26.2refactor

26.2refactor

Author: tr7zw

gradle-compose.yml

@@ -3,7 +3,7 @@ source: "https://github.com/tr7zw/ProcessedModTemplate/tree/master"
 replacements:
   name: "WaveyCapes"
   id: "waveycapes"
-  version: "1.9.2"
+  version: "1.10.0"
   description: "The cape shouldn't be a static slab!"
   homepageUrl: "https://modrinth.com/mod/wavey-capes"
   sourcesUrl: "https://github.com/tr7zw/WaveyCapes"

modern.json

@@ -1,6 +1,7 @@
 {
     "versions": [
         "26.1-fabric",
-        "26.1-neoforge"
+        "26.1-neoforge",
+        "26.2-fabric"
     ]
 }

replacements.gradle

@@ -0,0 +1,5 @@
+stonecutter {
+    replacements.string(current.parsed >= "1.21.11") {
+        replace("RenderType.", "RenderTypes.")
+    }
+}

src/main/java/dev/tr7zw/waveycapes/CapeNodeCollector.java

@@ -1,6 +1,7 @@
 package dev.tr7zw.waveycapes;
 
 import dev.tr7zw.waveycapes.delegate.PlayerDelegate;
+import dev.tr7zw.waveycapes.render.*;
 import dev.tr7zw.waveycapes.support.AnimationSupport;
 import dev.tr7zw.waveycapes.support.ShoulderSurfingSupport;
 import dev.tr7zw.waveycapes.support.SupportManager;
@@ -14,13 +15,8 @@ public abstract class WaveyCapesBase extends ModBase {
     @Getter
     public static WaveyCapesBase INSTANCE;
 
-    //? if >= 1.21.9 {
-
     @Getter
     private final CapeNodeCollector capeNodeCollector = new CapeNodeCollector();
-    //? }
-    @Getter
-    private final CustomCapeRenderer renderer = new CustomCapeRenderer();
 
     public void init() {
         INSTANCE = this;

src/main/java/dev/tr7zw/waveycapes/VanillaCapeRenderer.java

@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import dev.tr7zw.transition.mc.ComponentProvider;
+import dev.tr7zw.transition.mc.*;
 import dev.tr7zw.trender.gui.client.AbstractConfigScreen;
 import dev.tr7zw.trender.gui.client.BackgroundPainter;
 import dev.tr7zw.trender.gui.widget.WButton;
@@ -60,7 +60,7 @@ public CustomConfigScreen(Screen previous) {
             WButton doneButton = new WButton(CommonComponents.GUI_DONE);
             doneButton.setOnClick(() -> {
                 save();
-                Minecraft.getInstance().setScreen(previous);
+                GeneralUtil.setScreen(previous);
             });
             root.add(doneButton, 0, 26, 6, 2);
 

src/main/java/dev/tr7zw/waveycapes/WaveyCapesBase.java

@@ -16,8 +16,8 @@ public class PlayerDelegate implements MinecraftPlayer {
 
     private net.minecraft.world.entity.Avatar player;
     //? } else {
-    /*
-     private AbstractClientPlayer player;
+
+    /*private AbstractClientPlayer player;
     *///? }
 
     public double getXCloak() {
@@ -32,8 +32,8 @@ public double getXCloak() {
             return 0;
         }
         //? } else {
-        /*
-         return player.xCloak;
+
+        /*return player.xCloak;
         *///? }
     }
 
@@ -49,8 +49,8 @@ public double getZCloak() {
             return 0;
         }
         //? } else {
-        /*
-         return player.zCloak;
+
+        /*return player.zCloak;
         *///? }
     }
 

src/main/java/dev/tr7zw/waveycapes/WaveyCapesConfigScreen.java

@@ -22,8 +22,8 @@
 
 public class LivingEntityRendererMixin<S extends LivingEntity, T extends LivingEntityRenderState, M extends EntityModel<? super T>> {
     //? } else {
-    /*
-     public class LivingEntityRendererMixin<T extends LivingEntity, M extends EntityModel<T>> {
+
+    /*public class LivingEntityRendererMixin<T extends LivingEntity, M extends EntityModel<T>> {
     *///? }
 
     @Inject(method = "addLayer", at = @At("HEAD"), cancellable = true)