Merge remote-tracking branch 'upstream/master'

7 files changed, 91 insertions, 18 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
index b3a50697..93eac100 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
@@ -3,6 +3,7 @@ package me.xmrvizzy.skyblocker;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import me.xmrvizzy.skyblocker.skyblock.HotbarSlotLock;
 import me.xmrvizzy.skyblocker.skyblock.item.PriceInfoTooltip;
+import me.xmrvizzy.skyblocker.skyblock.item.WikiLookup;
 import net.fabricmc.api.ClientModInitializer;
 
 public class SkyblockerInitializer implements ClientModInitializer {
@@ -11,5 +12,6 @@ public class SkyblockerInitializer implements ClientModInitializer {
         HotbarSlotLock.init();
         SkyblockerConfig.init();
         PriceInfoTooltip.init();
+        WikiLookup.init();
     }
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/WikiLookup.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/WikiLookup.java
new file mode 100644
index 00000000..30da694e
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/WikiLookup.java
@@ -0,0 +1,72 @@
+package me.xmrvizzy.skyblocker.skyblock.item;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.option.KeyBinding;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.text.Text;
+import net.minecraft.util.Util;
+import org.lwjgl.glfw.GLFW;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
+
+public class WikiLookup {
+    public static KeyBinding wikiLookup;
+    static MinecraftClient client = MinecraftClient.getInstance();
+    static String id;
+    public static Gson gson = new Gson();
+
+    public static void init(){
+        wikiLookup = KeyBindingHelper.registerKeyBinding(new KeyBinding(
+                "key.wikiLookup",
+                GLFW.GLFW_KEY_F4,
+                "key.categories.skyblocker"
+        ));
+        ClientTickEvents.END_CLIENT_TICK.register(client -> {
+            while (wikiLookup.wasPressed()) {
+                id = getSkyblockId();
+
+                try {
+                    //Setting up a connection with the repo
+                    String urlString = "https://raw.githubusercontent.com/NotEnoughUpdates/NotEnoughUpdates-REPO/master/items/" + id + ".json";
+                    URL url = new URL(urlString);
+                    URLConnection request = url.openConnection();
+                    request.connect();
+
+                    //yoinking the wiki link
+                    JsonElement root = JsonParser.parseReader(new InputStreamReader((InputStream) request.getContent()));
+                    JsonObject rootobj = root.getAsJsonObject();
+                    String wikiLink = rootobj.get("info").getAsString();
+                    Util.getOperatingSystem().open(wikiLink);
+                } catch (IOException | NullPointerException e) {
+                    e.printStackTrace();
+                    client.player.sendMessage(Text.of("Can't locate a wiki article for this item..."), false);
+                }
+
+            }
+        });
+    }
+
+    public static String getSkyblockId() {
+
+        //Grabbing the skyblock NBT data
+        ItemStack mainStack = client.player.getMainHandStack();
+        NbtCompound nbt = mainStack.getSubNbt("ExtraAttributes");
+        if (nbt != null) {
+            id = nbt.getString("id");
+        }
+
+        return id;
+    }
+
+}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtilsLiving.java b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtilsLiving.java
index f6fb1bc1..962421b7 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtilsLiving.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtilsLiving.java
@@ -67,17 +67,17 @@ public class RenderUtilsLiving {
 
         if (fill) {
             int opacity = (int) (MinecraftClient.getInstance().options.getTextBackgroundOpacity(0.25F) * 255.0F) << 24;
-            mc.textRenderer.draw(text, -halfWidth, 0f, 553648127, false, matrices.peek().getModel(), immediate, true, opacity, 0xf000f0);
+            mc.textRenderer.draw(text, -halfWidth, 0f, 553648127, false, matrices.peek().getPositionMatrix(), immediate, true, opacity, 0xf000f0);
             immediate.draw();
         } else {
             matrices.push();
             matrices.translate(1, 1, 0);
-            mc.textRenderer.draw(text.copy(), -halfWidth, 0f, 0x202020, false, matrices.peek().getModel(), immediate, true, 0, 0xf000f0);
+            mc.textRenderer.draw(text.copy(), -halfWidth, 0f, 0x202020, false, matrices.peek().getPositionMatrix(), immediate, true, 0, 0xf000f0);
             immediate.draw();
             matrices.pop();
         }
 
-        mc.textRenderer.draw(text, -halfWidth, 0f, -1, false, matrices.peek().getModel(), immediate, true, 0, 0xf000f0);
+        mc.textRenderer.draw(text, -halfWidth, 0f, -1, false, matrices.peek().getPositionMatrix(), immediate, true, 0, 0xf000f0);
         immediate.draw();
 
         RenderSystem.disableBlend();
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Vertexer.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Vertexer.java
index f9ac629e..12f4b0fd 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/Vertexer.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Vertexer.java
@@ -57,17 +57,17 @@ public class Vertexer {
         int[] color = quadColor.getAllColors();
 
         if (cullMode != CULL_FRONT) {
-            vertexConsumer.vertex(matrices.peek().getModel(), x1, y1, z1).color(color[0], color[1], color[2], color[3]).next();
-            vertexConsumer.vertex(matrices.peek().getModel(), x2, y2, z2).color(color[4], color[5], color[6], color[7]).next();
-            vertexConsumer.vertex(matrices.peek().getModel(), x3, y3, z3).color(color[8], color[9], color[10], color[11]).next();
-            vertexConsumer.vertex(matrices.peek().getModel(), x4, y4, z4).color(color[12], color[13], color[14], color[15]).next();
+            vertexConsumer.vertex(matrices.peek().getPositionMatrix(), x1, y1, z1).color(color[0], color[1], color[2], color[3]).next();
+            vertexConsumer.vertex(matrices.peek().getPositionMatrix(), x2, y2, z2).color(color[4], color[5], color[6], color[7]).next();
+            vertexConsumer.vertex(matrices.peek().getPositionMatrix(), x3, y3, z3).color(color[8], color[9], color[10], color[11]).next();
+            vertexConsumer.vertex(matrices.peek().getPositionMatrix(), x4, y4, z4).color(color[12], color[13], color[14], color[15]).next();
         }
 
         if (cullMode != CULL_BACK) {
-            vertexConsumer.vertex(matrices.peek().getModel(), x4, y4, z4).color(color[0], color[1], color[2], color[3]).next();
-            vertexConsumer.vertex(matrices.peek().getModel(), x3, y3, z3).color(color[4], color[5], color[6], color[7]).next();
-            vertexConsumer.vertex(matrices.peek().getModel(), x2, y2, z2).color(color[8], color[9], color[10], color[11]).next();
-            vertexConsumer.vertex(matrices.peek().getModel(), x1, y1, z1).color(color[12], color[13], color[14], color[15]).next();
+            vertexConsumer.vertex(matrices.peek().getPositionMatrix(), x4, y4, z4).color(color[0], color[1], color[2], color[3]).next();
+            vertexConsumer.vertex(matrices.peek().getPositionMatrix(), x3, y3, z3).color(color[4], color[5], color[6], color[7]).next();
+            vertexConsumer.vertex(matrices.peek().getPositionMatrix(), x2, y2, z2).color(color[8], color[9], color[10], color[11]).next();
+            vertexConsumer.vertex(matrices.peek().getPositionMatrix(), x1, y1, z1).color(color[12], color[13], color[14], color[15]).next();
         }
     }
 
@@ -132,8 +132,8 @@ public class Vertexer {
     }
 
     public static void vertexLine(MatrixStack matrices, VertexConsumer vertexConsumer, float x1, float y1, float z1, float x2, float y2, float z2, LineColor lineColor) {
-        Matrix4f model = matrices.peek().getModel();
-        Matrix3f normal = matrices.peek().getNormal();
+        Matrix4f model = matrices.peek().getPositionMatrix();
+        Matrix3f normal = matrices.peek().getNormalMatrix();
 
         Vec3f normalVec = getNormal(normal, x1, y1, z1, x2, y2, z2);
 
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index a1f0198e..680787e8 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -1,6 +1,7 @@
 {
   "key.categories.skyblocker": "Skyblocker",
   "key.hotbarSlotLock": "Slot Lock (Hotbar)",
+  "key.wikiLookup": "Wiki Lookup",
 
   "text.autoconfig.skyblocker.title": "Skyblocker Settings",
 
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 250e5737..8ef1482d 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -5,7 +5,7 @@
   "name": "Skyblocker",
   "description": "Hypixel Skyblock Mod",
   "authors": ["xMrVizzy", "d3dx9", "LifeIsAParadox"],
-  "contributors": ["ExternalTime", "Zailer43"],
+  "contributors": ["ExternalTime", "Zailer43", "TacoMonkey"],
   "contact": {
     "homepage": "https://hysky.de",
     "sources": "https://github.com/LifeIsAParadox/Skyblocker",
@@ -29,8 +29,7 @@
     "fabricloader": ">=0.12.11",
     "fabric": "*",
 	"cloth-config2": "*",
-    "minecraft": "1.17.x",
-    "java": ">=16"
+    "minecraft": ["1.18.x","1.17.x"]
   },
   "custom": {
     "modmenu": {
diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json
index bfc6b0f2..abc219fa 100644
--- a/src/main/resources/skyblocker.mixins.json
+++ b/src/main/resources/skyblocker.mixins.json
@@ -1,11 +1,10 @@
 {
   "required": true,
   "package": "me.xmrvizzy.skyblocker.mixin",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
   "client": [
     "ChatHudListenerMixin",
     "ClientPlayerEntityMixin",
-    "ClientPlayNetworkHandlerMixin",
     "InGameHudMixin",
     "ItemRendererMixin",
     "MinecraftClientMixin",