1.21.8-9 fixes

Author: JumperOnJava

src/main/java/io/github/jumperonjava/customcursor/CursorEditScreen.java

@@ -5,8 +5,6 @@
 //? if >= 1.21.6
 /*import net.minecraft.client.gl.RenderPipelines;*/
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.cursor.Cursor;
-import net.minecraft.client.gui.cursor.StandardCursors;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
@@ -29,6 +27,7 @@ public CursorEditScreen(Screen parent, CursorSettings cursorConfig, Consumer<Cur
         this.parent = parent;
         this.onSuccess = onSuccess;
         this.targetConfig = cursorConfig.clone();
+        this.targetCursor = targetConfig.pointer;
     }
 
     @Override
@@ -138,7 +137,7 @@ protected void init() {
 
     float time = 0;
     private void testcursor(DrawContext context, int mouseX, int mouseY, float delta) {
-        context.setCursor(StandardCursors.CROSSHAIR);
+//        context.setCursor(StandardCursors.CROSSHAIR);
     }
 
     private void setIdentifier(Identifier identifier) {

src/main/java/io/github/jumperonjava/customcursor/CursorRenderer.java

@@ -23,9 +23,9 @@ public static void render(DrawContext context, int mouseX, int mouseY, float don
         var scale = MinecraftClient.getInstance().getWindow().getScaleFactor();
         //? if < 1.21.5
         RenderSystem.depthFunc(GL11.GL_ALWAYS);
-        var identifier = config.identifier;
-        var x = (int) Math.round(mouseX - config.size * config.x / scale);
-        var y = (int) Math.round(mouseY - config.size * config.y / scale);
+        var identifier = config.currentCursor().identifier;
+        var x = (int) Math.round(mouseX - config.size * config.currentCursor().x / scale);
+        var y = (int) Math.round(mouseY - config.size * config.currentCursor().y / scale);
         var u = (float) 0;
         var v = (float) 0;
         var width = (int) (config.size / scale);

src/main/java/io/github/jumperonjava/customcursor/CursorSettings.java

@@ -2,8 +2,6 @@
 
 
 import com.google.gson.Gson;
-import net.minecraft.client.gui.cursor.Cursor;
-import net.minecraft.client.gui.cursor.StandardCursors;
 import net.minecraft.util.Identifier;
 
 import java.util.Objects;
@@ -12,20 +10,24 @@ public class CursorSettings implements Cloneable{
     public int size=32;
     public boolean enabled=false;
 
-    CursorSprite pointer = new CursorSprite(1,9, 0, false,Identifier.ofVanilla("textures/item/diamond_sword.png"));
-    CursorSprite arrow = new CursorSprite(0,0, 0, false,Identifier.ofVanilla("textures/item/arrow.png"));
-    CursorSprite ibeam = new CursorSprite(0,0, 0, false,Identifier.ofVanilla("textures/item/ink_sac.png"));
-    CursorSprite crosshair = new CursorSprite(0,0, 0, false,Identifier.ofVanilla("textures/item/lead.png"));
-    CursorSprite pointing_hand = new CursorSprite(0,0, 0, false,Identifier.ofVanilla("textures/item/rabbit_foot.png"));
-    CursorSprite resize_ns = new CursorSprite(0,0, 0, false,Identifier.ofVanilla("textures/item/golden_hoe.png"));
-    CursorSprite resize_ew = new CursorSprite(0,0, 0, false,Identifier.ofVanilla("textures/item/copper_hoe.png"));
-    CursorSprite resize_all = new CursorSprite(0,0, 0, false,Identifier.ofVanilla("textures/item/nether_star.png"));
-    CursorSprite not_allowed = new CursorSprite(0,0, 0, false,Identifier.ofVanilla("textures/item/barrier.png"));
+    CursorSprite pointer = new CursorSprite(1,9, 0, false,Identifier.of("minecraft", "textures/item/diamond_sword.png"));
+    CursorSprite arrow = new CursorSprite(0,0, 0, false,Identifier.of("minecraft", "textures/item/arrow.png"));
+    CursorSprite ibeam = new CursorSprite(0,0, 0, false,Identifier.of("minecraft", "textures/item/ink_sac.png"));
+    CursorSprite crosshair = new CursorSprite(0,0, 0, false,Identifier.of("minecraft", "textures/item/lead.png"));
+    CursorSprite pointing_hand = new CursorSprite(0,0, 0, false,Identifier.of("minecraft", "textures/item/rabbit_foot.png"));
+    CursorSprite resize_ns = new CursorSprite(0,0, 0, false,Identifier.of("minecraft", "textures/item/golden_hoe.png"));
+    CursorSprite resize_ew = new CursorSprite(0,0, 0, false,Identifier.of("minecraft", "textures/item/copper_hoe.png"));
+    CursorSprite resize_all = new CursorSprite(0,0, 0, false,Identifier.of("minecraft", "textures/item/nether_star.png"));
+    CursorSprite not_allowed = new CursorSprite(0,0, 0, false,Identifier.of("minecraft", "textures/item/barrier.png"));
 
     public CursorSettings clone() {
         return new Gson().fromJson(new Gson().toJson(this), CursorSettings.class);
     }
 
+    public CursorSprite currentCursor() {
+        return pointer;
+    }
+
     public static final class CursorSprite {
         public float x;
         public float y;

src/main/java/io/github/jumperonjava/customcursor/mixin/CobblemonFix.java

@@ -32,7 +32,11 @@ void lock(DrawContext context, float tickDelta, CallbackInfo ci){
             locked = true;
             var x = (double) (this.client.getWindow().getWidth() / 2);
             var y = (double) (this.client.getWindow().getHeight() / 2);
-            InputUtil.setCursorParameters(this.client.getWindow(), 212995, x, y);
+            //? if <= 1.21.8 {
+            InputUtil.setCursorParameters(this.client.getWindow().getHandle(), 212995, x, y);
+            //? } else {
+            /*InputUtil.setCursorParameters(this.client.getWindow(), 212995, x, y);
+            *///?}
         } else {
             locked = false;
         }

src/main/java/io/github/jumperonjava/customcursor/mixin/TooltipPositionMixin.java

@@ -16,7 +16,7 @@ void tooltipPosChange(Args args){
         var scale = MinecraftClient.getInstance().getWindow().getScaleFactor();
         var cursor = CustomCursorInit.getConfig().pointer.clone();
         cursor.size/=scale;
-        args.set(0,(int)args.get(0) - 6 + (int)(cursor.size * (1-cursor.x)));
-        args.set(1,(int)args.get(1) - (int)(cursor.size * (cursor.y)));
+        args.set(0,(int)args.get(0) - 6 + (int)(cursor.size * (1-cursor.currentCursor().x)));
+        args.set(1,(int)args.get(1) - (int)(cursor.size * (cursor.currentCursor().y)));
     }
 }

src/main/java/io/github/jumperonjava/customcursor/util/ScrollListWidget.java

@@ -2,7 +2,9 @@
 
 import com.google.common.collect.Lists;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.Click;
+//? if > 1.21.8 {
+/*import net.minecraft.client.gui.Click;
+*///?}
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.Drawable;
 import net.minecraft.client.gui.Element;