Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into beeper-creams

# Conflicts:
#	src/main/java/de/hysky/skyblocker/SkyblockerMod.java
#	src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java

Pull updates from upstream and NOT get a heart attack

1 files changed, 0 insertions, 56 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/WikiLookup.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/WikiLookup.java
deleted file mode 100644
index a6412cf7..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/WikiLookup.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package me.xmrvizzy.skyblocker.skyblock.item;
-
-import me.xmrvizzy.skyblocker.skyblock.itemlist.ItemRegistry;
-import me.xmrvizzy.skyblocker.utils.Utils;
-import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.option.KeyBinding;
-import net.minecraft.client.util.InputUtil;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.screen.slot.Slot;
-import net.minecraft.text.Text;
-import net.minecraft.util.Util;
-import org.lwjgl.glfw.GLFW;
-
-import java.util.concurrent.CompletableFuture;
-
-public class WikiLookup {
-    public static KeyBinding wikiLookup;
-    static final MinecraftClient client = MinecraftClient.getInstance();
-    static String id;
-
-    public static void init() {
-        wikiLookup = KeyBindingHelper.registerKeyBinding(new KeyBinding(
-                "key.wikiLookup",
-                InputUtil.Type.KEYSYM,
-                GLFW.GLFW_KEY_F4,
-                "key.categories.skyblocker"
-        ));
-    }
-
-    public static String getSkyblockId(Slot slot) {
-        //Grabbing the skyblock NBT data
-        ItemStack selectedStack = slot.getStack();
-        NbtCompound nbt = selectedStack.getSubNbt("ExtraAttributes");
-        if (nbt != null) {
-            id = nbt.getString("id");
-        }
-        return id;
-    }
-
-    public static void openWiki(Slot slot) {
-        if (Utils.isOnSkyblock()) {
-            id = getSkyblockId(slot);
-            try {
-                String wikiLink = ItemRegistry.getWikiLink(id);
-                CompletableFuture.runAsync(() -> Util.getOperatingSystem().open(wikiLink));
-            } catch (IndexOutOfBoundsException | IllegalStateException e) {
-                e.printStackTrace();
-                if (client.player != null)
-                    client.player.sendMessage(Text.of("Error while retrieving wiki article..."), false);
-            }
-        }
-    }
-
-}