aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java9
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java14
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/item/WikiLookup.java57
3 files changed, 52 insertions, 28 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java b/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java
index a3599196..36d225b6 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java
@@ -1,5 +1,6 @@
package me.xmrvizzy.skyblocker.discord;
+import com.google.gson.JsonObject;
import com.jagrosh.discordipc.IPCClient;
import com.jagrosh.discordipc.IPCListener;
import com.jagrosh.discordipc.entities.RichPresence;
@@ -54,6 +55,7 @@ public class DiscordRPCManager implements IPCListener{
}
public void stop(){
+ logger.info("Closing...");
isConnected = false;
client.close();
client = null;
@@ -64,4 +66,11 @@ public class DiscordRPCManager implements IPCListener{
logger.info("Started!");
isConnected = true;
}
+
+ @Override
+ public void onClose(IPCClient client, JsonObject json) {
+ logger.info("Closed");
+ isConnected = false;
+ }
+
}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
index ef1f99fa..96711158 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
@@ -1,18 +1,23 @@
package me.xmrvizzy.skyblocker.mixin;
import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.skyblock.item.WikiLookup;
import me.xmrvizzy.skyblocker.skyblock.itemlist.ItemListWidget;
import me.xmrvizzy.skyblocker.skyblock.quicknav.QuickNav;
import me.xmrvizzy.skyblocker.skyblock.quicknav.QuickNavButton;
import me.xmrvizzy.skyblocker.utils.Utils;
+import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.screen.slot.Slot;
import net.minecraft.text.Text;
+import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.List;
@Mixin(HandledScreen.class)
@@ -23,6 +28,8 @@ public abstract class HandledScreenMixin extends Screen {
protected HandledScreenMixin(Text title) {
super(title);
}
+ @Shadow
+ @Nullable protected Slot focusedSlot;
@Inject(method = "init()V", at = @At("TAIL"))
private void init(CallbackInfo ci) {
@@ -43,4 +50,11 @@ public abstract class HandledScreenMixin extends Screen {
}
}
+
+ @Inject(at = @At("HEAD"), method = "keyPressed", cancellable = true)
+ public void keyPressed(int keyCode, int scanCode, int modifiers, CallbackInfoReturnable<Boolean> cir) {
+ if (keyCode != 256 && !MinecraftClient.getInstance().options.keyInventory.matchesKey(keyCode, scanCode)){
+ if (WikiLookup.wikiLookup.matchesKey(keyCode, scanCode)) WikiLookup.openWiki(focusedSlot);
+ }
+ }
}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/WikiLookup.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/WikiLookup.java
index 30da694e..a0788126 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/WikiLookup.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/WikiLookup.java
@@ -4,12 +4,15 @@ import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
+import me.xmrvizzy.skyblocker.utils.Utils;
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.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;
@@ -29,44 +32,42 @@ public class WikiLookup {
public static void init(){
wikiLookup = KeyBindingHelper.registerKeyBinding(new KeyBinding(
"key.wikiLookup",
+ InputUtil.Type.KEYSYM,
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() {
-
+ public static String getSkyblockId(Slot slot) {
//Grabbing the skyblock NBT data
- ItemStack mainStack = client.player.getMainHandStack();
- NbtCompound nbt = mainStack.getSubNbt("ExtraAttributes");
+ 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.isSkyblock){
+ id = getSkyblockId(slot);
+ 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);
+ }
+ }
+ }
+
}
generated by cgit (git 2.46.0) at 2025-02-11 20:41:05 +0000