Just commits change i forgot to commit

some todos will follow

4 files changed, 31 insertions, 16 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java
index c06822de..8bfa9c0a 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java
@@ -30,7 +30,8 @@ public class Reparty extends ChatPatternListener {
             dispatcher.register(ClientCommandManager.literal("rp").executes(context -> {
                 if (!Utils.isOnSkyblock || this.repartying || client.player == null) return 0;
                 this.repartying = true;
-                client.player.sendChatMessage("/p list", Text.of("/p list"));
+                //client.player.sendChatMessage("/p list", Text.of("/p list"));
+                client.player.sendMessage(Text.of("/p list"));
                 return 0;
             }));
         });
@@ -77,6 +78,7 @@ public class Reparty extends ChatPatternListener {
     }
 
     private void sendCommand(ClientPlayerEntity player, String command, int delay) {
-        skyblocker.scheduler.schedule(() -> player.sendChatMessage(command, Text.of(command)), delay * BASE_DELAY);
+        // skyblocker.scheduler.schedule(() -> player.sendChatMessage(command, Text.of(command)), delay * BASE_DELAY);
+        skyblocker.scheduler.schedule(() -> player.sendMessage(Text.of(command)), delay * BASE_DELAY);
     }
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java
index 6067ff48..552d3def 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java
@@ -38,9 +38,12 @@ public class ResultButtonWidget extends ClickableWidget {
         MinecraftClient client = MinecraftClient.getInstance();
         RenderSystem.setShader(GameRenderer::getPositionTexProgram);
         RenderSystem.setShaderTexture(0, BACKGROUND_TEXTURE);
-        this.drawTexture(matrices, this.x, this.y, 29, 206, this.width, this.height);
-        client.getItemRenderer().renderInGui(this.itemStack, this.x + 4, this.y + 4);
-        client.getItemRenderer().renderGuiItemOverlay(client.textRenderer, itemStack, this.x + 4, this.y + 4);
+        // this.drawTexture(matrices, this.x, this.y, 29, 206, this.width, this.height);
+        this.drawTexture(matrices, this.getX(), this.getY(), 29, 206, this.getWidth(), this.getHeight());
+        // client.getItemRenderer().renderInGui(this.itemStack, this.x + 4, this.y + 4);
+        client.getItemRenderer().renderInGui(this.itemStack, this.getX() + 4, this.getY() + 4);
+        // client.getItemRenderer().renderGuiItemOverlay(client.textRenderer, itemStack, this.x + 4, this.y + 4);
+        client.getItemRenderer().renderGuiItemOverlay(client.textRenderer, itemStack, this.getX() + 4, this.getY() + 4);
     }
 
     @Override
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java
index ac381240..985cbd22 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java
@@ -49,8 +49,10 @@ public class QuickNavButton extends ClickableWidget {
             int w = ((HandledScreenAccessor)handledScreen).getBackgroundWidth();
             int h = ((HandledScreenAccessor)handledScreen).getBackgroundHeight();
             if (h > 166) --h; // why is this even a thing
-            this.x = x + this.index % 6 * 28 + 4;
-            this.y = this.index < 6 ? y - 28 : y + h - 4;
+            // this.x = x + this.index % 6 * 28 + 4;
+            this.setX(x + this.index % 6 * 28 + 4);
+            // this.y = this.index < 6 ? y - 28 : y + h - 4;
+            this.setY(this.index < 6 ? y - 28 : y + h - 4);
             this.u = 28;
             this.v = (index < 6 ? 0 : 64) + (toggled ? 32 : 0);
         }
@@ -60,7 +62,8 @@ public class QuickNavButton extends ClickableWidget {
     public void onClick(double mouseX, double mouseY) {
         if (!this.toggled) {
             this.toggled = true;
-            CLIENT.player.sendChatMessage(command, Text.of(command));
+            // CLIENT.player.sendChatMessage(command, Text.of(command));
+            CLIENT.player.sendMessage(Text.of(command));
         }
     }
 
@@ -72,21 +75,28 @@ public class QuickNavButton extends ClickableWidget {
         // render button background
         if (!this.toggled) {
             if (this.index >= 6)
-                this.drawTexture(matrices, this.x, this.y + 4, this.u, this.v + 4, this.width, this.height - 4);
+                // this.drawTexture(matrices, this.x, this.y + 4, this.u, this.v + 4, this.width, this.height - 4);
+                this.drawTexture(matrices, this.getX(), this.getY() + 4, this.u, this.v + 4, this.width, this.height - 4);
             else
-                this.drawTexture(matrices, this.x, this.y, this.u, this.v, this.width, this.height - 4);
-        } else this.drawTexture(matrices, this.x, this.y, this.u, this.v, this.width, this.height);
+                // this.drawTexture(matrices, this.x, this.y, this.u, this.v, this.width, this.height - 4);
+                this.drawTexture(matrices, this.getX(), this.getY(), this.u, this.v, this.width, this.height - 4);
+        // } else this.drawTexture(matrices, this.x, this.y, this.u, this.v, this.width, this.height);
+        } else this.drawTexture(matrices, this.getX(), this.getY(), this.u, this.v, this.width, this.height);
         // render button icon
         if (!this.toggled) {
             if (this.index >= 6)
-                CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 6);
+                // CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 6);
+                CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 6, this.getY() + 6);
             else
-                CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 9);
+                // CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 9);
+                CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 6, this.getY() + 9);
         } else {
             if (this.index >= 6)
-                CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 9);
+                // CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 9);
+                CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 6, this.getY() + 9);
             else
-                CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 6);
+                // CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 6);
+                CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 6, this.getY() + 6);
         }
         RenderSystem.enableDepthTest();
     }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java
index c659f4f9..0f2f3aef 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java
@@ -17,7 +17,7 @@ import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-//import net.minecraft.util.math.Vec3f;
+// import net.minecraft.util.math.Vec3f;
 import net.minecraft.util.math.RotationAxis;
 
 public class RenderUtils {