Merge pull request #109 from Julienraptor01/1.19.3

Update to 1.19.3

8 files changed, 101 insertions, 61 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..19f13c32 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java
@@ -1,18 +1,18 @@
 package me.xmrvizzy.skyblocker.skyblock.dungeon;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import me.xmrvizzy.skyblocker.SkyblockerMod;
 import me.xmrvizzy.skyblocker.chat.ChatFilterResult;
 import me.xmrvizzy.skyblocker.chat.ChatPatternListener;
 import me.xmrvizzy.skyblocker.utils.Utils;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.text.Text;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 public class Reparty extends ChatPatternListener {
     private static final MinecraftClient client = MinecraftClient.getInstance();
     private static final SkyblockerMod skyblocker = SkyblockerMod.getInstance();
@@ -30,7 +30,7 @@ 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.networkHandler.sendCommand("p list");
                 return 0;
             }));
         });
@@ -68,15 +68,16 @@ public class Reparty extends ChatPatternListener {
             this.repartying = false;
             return;
         }
-        sendCommand(playerEntity, "/p disband", 1);
+        sendCommand(playerEntity, "p disband", 1);
         for (int i = 0; i < this.players.length; ++i) {
-            String command = "/p invite " + this.players[i];
+            String command = "p invite " + this.players[i];
             sendCommand(playerEntity, command, i + 2);
         }
         skyblocker.scheduler.schedule(() -> this.repartying = false, this.players.length + 2);
     }
 
     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.networkHandler.sendCommand(command), delay * BASE_DELAY);
     }
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java
index b437ce10..81bee4ba 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java
@@ -1,5 +1,12 @@
 package me.xmrvizzy.skyblocker.skyblock.dungeon;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+
 import me.xmrvizzy.skyblocker.chat.ChatFilterResult;
 import me.xmrvizzy.skyblocker.chat.ChatPatternListener;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
@@ -8,9 +15,6 @@ import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 
-import java.util.*;
-import java.util.regex.Matcher;
-
 public class Trivia extends ChatPatternListener {
     private static final Map<String, String[]> answers;
     private List<String> solutions = Collections.emptyList();
@@ -65,7 +69,7 @@ public class Trivia extends ChatPatternListener {
         answers.put("What is the status of Storm?", new String[]{"The Wither Lords"});
         answers.put("What is the status of Necron?", new String[]{"The Wither Lords"});
         answers.put("What is the status of Maxor, Storm, Goldor and Necron?", new String[]{"The Wither Lords"});
-        answers.put("How many total Fairy Souls are there?", new String[]{"238 Fairy Souls"});
+        answers.put("How many total Fairy Souls are there?", new String[]{"239 Fairy Souls"});
         answers.put("How many Fairy Souls are there in Spider's Den?", new String[]{"19 Fairy Souls"});
         answers.put("How many Fairy Souls are there in The End?", new String[]{"12 Fairy Souls"});
         answers.put("How many Fairy Souls are there in The Farming Islands?", new String[]{"20 Fairy Souls"});
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java
index a589b759..f5c97738 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java
@@ -6,9 +6,10 @@ import me.xmrvizzy.skyblocker.container.ContainerSolver;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+// import net.minecraft.registry.Registry;
+import net.minecraft.registry.Registries;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -62,7 +63,8 @@ public class ColorTerminal extends ContainerSolver {
         itemColor = new HashMap<>();
         for (DyeColor color : DyeColor.values())
             for (String item : new String[]{"dye", "wool", "stained_glass", "terracotta"})
-                itemColor.put(Registry.ITEM.get(new Identifier(color.getName() + '_' + item)), color);
+                // itemColor.put(Registry.ITEM.get(new Identifier(color.getName() + '_' + item)), color);
+                itemColor.put(Registries.ITEM.get(new Identifier(color.getName() + '_' + item)), color);
         itemColor.put(Items.BONE_MEAL, DyeColor.WHITE);
         itemColor.put(Items.LAPIS_LAZULI, DyeColor.BLUE);
         itemColor.put(Items.COCOA_BEANS, DyeColor.BROWN);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemFixerUpper.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemFixerUpper.java
index dc2d9947..249fba9f 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemFixerUpper.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemFixerUpper.java
@@ -1,9 +1,10 @@
 package me.xmrvizzy.skyblocker.skyblock.itemlist;
 
 import net.minecraft.item.Items;
+// import net.minecraft.registry.Registry;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
-
 import java.util.Map;
 
 public class ItemFixerUpper {
@@ -223,11 +224,14 @@ public class ItemFixerUpper {
         if (id.equals("minecraft:prismarine")) return PRISMARINE_VARIANTS[damage];
 
         id = MAPPING.getOrDefault(id, id);
-        if (Registry.ITEM.get(new Identifier(id)).equals(Items.AIR)) {
+        // if (Registry.ITEM.get(new Identifier(id)).equals(Items.AIR)) {
+        if (Registries.ITEM.get(new Identifier(id)).equals(Items.AIR)) {
             String shortId = id.split(":")[1];
-            if (damage < BLOCK_COLORS.length && !Registry.ITEM.get(new Identifier("minecraft:" + BLOCK_COLORS[damage] + shortId)).equals(Items.AIR))
+            // if (damage < BLOCK_COLORS.length && !Registry.ITEM.get(new Identifier("minecraft:" + BLOCK_COLORS[damage] + shortId)).equals(Items.AIR))
+            if (damage < BLOCK_COLORS.length && !Registries.ITEM.get(new Identifier("minecraft:" + BLOCK_COLORS[damage] + shortId)).equals(Items.AIR))
                 return "minecraft:" + BLOCK_COLORS[damage] + shortId;
-            if (damage < TREE_VARIANTS.length && !Registry.ITEM.get(new Identifier("minecraft:" + TREE_VARIANTS[damage] + shortId)).equals(Items.AIR))
+            // if (damage < TREE_VARIANTS.length && !Registry.ITEM.get(new Identifier("minecraft:" + TREE_VARIANTS[damage] + shortId)).equals(Items.AIR))
+            if (damage < TREE_VARIANTS.length && !Registries.ITEM.get(new Identifier("minecraft:" + TREE_VARIANTS[damage] + shortId)).equals(Items.AIR))
                 return "minecraft:" + TREE_VARIANTS[damage] + shortId;
 
             if (id.contains("wooden_")) return id.replaceFirst("wooden_", TREE_VARIANTS[damage]);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java
index a635cea2..ce567b67 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java
@@ -1,6 +1,7 @@
 package me.xmrvizzy.skyblocker.skyblock.itemlist;
 
 import com.mojang.blaze3d.systems.RenderSystem;
+
 import me.xmrvizzy.skyblocker.mixin.RecipeBookWidgetAccessor;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -13,7 +14,6 @@ import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.screen.AbstractRecipeScreenHandler;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableTextContent;
 import net.minecraft.util.Formatting;
 
 @Environment(value= EnvType.CLIENT)
@@ -48,7 +48,7 @@ public class ItemListWidget extends RecipeBookWidget implements Drawable, Select
         if (this.isOpen()) {
             matrices.push();
             matrices.translate(0.0D, 0.0D, 100.0D);
-            RenderSystem.setShader(GameRenderer::getPositionTexShader);
+            RenderSystem.setShader(GameRenderer::getPositionTexProgram);
             RenderSystem.setShaderTexture(0, TEXTURE);
             RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
             this.searchField = ((RecipeBookWidgetAccessor)this).getSearchField();
@@ -76,14 +76,16 @@ public class ItemListWidget extends RecipeBookWidget implements Drawable, Select
     }
 
     @Override
-    public boolean mouseClicked(double mouseX, double mouseY, int button) {
-        if (this.isOpen() && !this.client.player.isSpectator()) {
-            if (this.searchField.mouseClicked(mouseX, mouseY, button)) {
-                this.results.closeRecipeView();
-                return true;
-            }
-            if (this.results.mouseClicked(mouseX, mouseY, button)) return true;
-        }
-        return false;
-    }
-}
+	public boolean mouseClicked(double mouseX, double mouseY, int button) {
+		if (!this.isOpen() || this.client.player.isSpectator()) {
+			return false;
+		}
+		if (this.searchField != null && this.searchField.mouseClicked(mouseX, mouseY, button)) {
+			this.results.closeRecipeView();
+			return true;
+		}
+		if (this.results.mouseClicked(mouseX, mouseY, button))
+			return true;
+		return false;
+	}
+}
\ No newline at end of file
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 57fcbcd2..6d0d89e1 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java
@@ -1,6 +1,9 @@
 package me.xmrvizzy.skyblocker.skyblock.itemlist;
 
+import java.util.List;
+
 import com.mojang.blaze3d.systems.RenderSystem;
+
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;
 import net.minecraft.client.gui.widget.ClickableWidget;
@@ -11,8 +14,6 @@ import net.minecraft.item.Items;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
-import java.util.List;
-
 public class ResultButtonWidget extends ClickableWidget {
     private static final Identifier BACKGROUND_TEXTURE = new Identifier("textures/gui/recipe_book.png");
 
@@ -36,22 +37,26 @@ public class ResultButtonWidget extends ClickableWidget {
     @Override
     public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float delta) {
         MinecraftClient client = MinecraftClient.getInstance();
-        RenderSystem.setShader(GameRenderer::getPositionTexShader);
+        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
     public void renderTooltip(MatrixStack matrices, int mouseX, int mouseY) {
         MinecraftClient client = MinecraftClient.getInstance();
         List<Text> tooltip = client.currentScreen.getTooltipFromItem(this.itemStack);
+        // TODO : add null check with log error
         client.currentScreen.renderTooltip(matrices, tooltip, mouseX, mouseY);
     }
 
-    @Override
-    public void appendNarrations(NarrationMessageBuilder builder) {
-
-    }
+	@Override
+	protected void appendClickableNarrations(NarrationMessageBuilder builder) {
+		// TODO Auto-generated method stub
+		
+	}
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java
index 4ea7fb99..85ebd3a6 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java
@@ -1,7 +1,12 @@
 package me.xmrvizzy.skyblocker.skyblock.quicknav;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
+
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.nbt.StringNbtReader;
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..f35e60b2 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java
@@ -1,6 +1,7 @@
 package me.xmrvizzy.skyblocker.skyblock.quicknav;
 
 import com.mojang.blaze3d.systems.RenderSystem;
+
 import me.xmrvizzy.skyblocker.mixin.HandledScreenAccessor;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -11,7 +12,6 @@ import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
-import net.minecraft.text.LiteralTextContent;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
@@ -20,11 +20,6 @@ public class QuickNavButton extends ClickableWidget {
     private static final MinecraftClient CLIENT = MinecraftClient.getInstance();
     private static final Identifier BUTTON_TEXTURE = new Identifier("textures/gui/container/creative_inventory/tabs.png");
 
-    @Override
-    public void appendNarrations(NarrationMessageBuilder builder) {
-
-    }
-
     private int index;
     private boolean toggled;
     private int u;
@@ -33,7 +28,7 @@ public class QuickNavButton extends ClickableWidget {
     private final ItemStack icon;
 
     public QuickNavButton(int index, boolean toggled, String command, ItemStack icon) {
-        super(0, 0, 28, 32, Text.empty());
+        super(0, 0, 26, 32, Text.empty());
         this.index = index;
         this.toggled = toggled;
         this.command = command;
@@ -49,9 +44,11 @@ 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.u = 28;
+            // this.x = x + this.index % 6 * 28 + 4;
+            this.setX(x + this.index % 6 * 26 + 4);
+            // this.y = this.index < 6 ? y - 28 : y + h - 4;
+            this.setY(this.index < 6 ? y - 26 : y + h - 4);
+            this.u = 26;
             this.v = (index < 6 ? 0 : 64) + (toggled ? 32 : 0);
         }
     }
@@ -60,7 +57,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.networkHandler.sendCommand(command.replace("/", ""));
+            // TODO : add null check with log error
         }
     }
 
@@ -72,22 +70,41 @@ 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() - 2, 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 {
+        	matrices.push();
+        	//Move the top buttons 2 pixels up if they're selected
+        	if (this.index < 6) matrices.translate(0f, -2f, 0f);
+        	this.drawTexture(matrices, this.getX(), this.getY(), this.u, this.v, this.width, this.height);
+        	matrices.pop();
+        }
         // 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() + 5, 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() + 5, this.getY() + 7);
         } 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() + 5, 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() + 5, this.getY() + 6);
         }
         RenderSystem.enableDepthTest();
     }
+
+	@Override
+	protected void appendClickableNarrations(NarrationMessageBuilder builder) {
+		// TODO Auto-generated method stub
+		
+	}
 }