diff options
Diffstat (limited to 'src/main')
6 files changed, 77 insertions, 34 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java index 29e98038..d7145117 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java +++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java @@ -6,6 +6,7 @@ import me.xmrvizzy.skyblocker.discord.DiscordRPCManager; import me.xmrvizzy.skyblocker.skyblock.dungeon.DungeonBlaze; import me.xmrvizzy.skyblocker.utils.Utils; import net.minecraft.client.MinecraftClient; +import net.minecraft.text.Text; import java.util.Objects; @@ -14,7 +15,6 @@ public class SkyblockerMod { private static final SkyblockerMod instance = new SkyblockerMod(); public final ContainerSolverManager containerSolverManager = new ContainerSolverManager(); public DiscordRPCManager discordRPCManager = new DiscordRPCManager(); - public static int rpTimer = 0; private SkyblockerMod() { } @@ -24,6 +24,7 @@ public class SkyblockerMod { } private int ticks = 0; + private int rpTimer = 0; public void onTick() { MinecraftClient client = MinecraftClient.getInstance(); @@ -42,6 +43,8 @@ public class SkyblockerMod { rpTimer++; if (rpTimer == 5){ discordRPCManager.updatePresence(); + discordRPCManager.cycleCount++; + if (discordRPCManager.cycleCount == 3) discordRPCManager.cycleCount = 0; rpTimer = 0; } if (client.world != null && !client.isInSingleplayer()) diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 3eca5fd2..c4251e6c 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -36,11 +36,11 @@ public class SkyblockerConfig implements ConfigData { public RichPresence richPresence = new RichPresence(); @ConfigEntry.Category("itemList") - @ConfigEntry.Gui.CollapsibleObject(startExpanded = true) + @ConfigEntry.Gui.CollapsibleObject() public ItemList itemList = new ItemList(); @ConfigEntry.Category("quicknav") - @ConfigEntry.Gui.CollapsibleObject(startExpanded = true) + @ConfigEntry.Gui.CollapsibleObject() public Quicknav quicknav = new Quicknav(); @ConfigEntry.Gui.Excluded @@ -53,7 +53,9 @@ public class SkyblockerConfig implements ConfigData { public static class RichPresence { public boolean enableRichPresence = false; @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) + @ConfigEntry.Gui.Tooltip() public Info info = Info.LOCATION; + public boolean cycleMode = false; public String customMessage; } diff --git a/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java b/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java index a3599196..84dcc0c5 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; @@ -17,6 +18,7 @@ public class DiscordRPCManager implements IPCListener{ public boolean isConnected; public static final Logger logger = LoggerFactory.getLogger("Skyblocker DiscordRPC"); public static DecimalFormat dFormat = new DecimalFormat("###,###.##"); + public int cycleCount = 0; public void start(){ try { @@ -47,13 +49,24 @@ public class DiscordRPCManager implements IPCListener{ public String getInfo(){ String info = null; - if (SkyblockerConfig.get().general.richPresence.info == SkyblockerConfig.Info.BITS) info = "Bits: " + dFormat.format(Utils.getBits()); - if (SkyblockerConfig.get().general.richPresence.info == SkyblockerConfig.Info.PURSE) info = "Purse: " + dFormat.format(Utils.getPurse()); - if (SkyblockerConfig.get().general.richPresence.info == SkyblockerConfig.Info.LOCATION) info = "⏣ " + Utils.getLocation(); + if (!SkyblockerConfig.get().general.richPresence.cycleMode){ + switch (SkyblockerConfig.get().general.richPresence.info){ + case BITS -> info = "Bits: " + dFormat.format(Utils.getBits()); + case PURSE -> info = "Purse: " + dFormat.format(Utils.getPurse()); + case LOCATION -> info = "⏣ " + Utils.getLocation(); + } + } else if (SkyblockerConfig.get().general.richPresence.cycleMode){ + switch (cycleCount){ + case 0 -> info = "Bits: " + dFormat.format(Utils.getBits()); + case 1 -> info = "Purse: " + dFormat.format(Utils.getPurse()); + case 2 -> info = "⏣ " + Utils.getLocation(); + } + } return info; } public void stop(){ + logger.info("Closing..."); isConnected = false; client.close(); client = null; @@ -64,4 +77,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 7dae036d..d676dc25 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java @@ -1,17 +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; @@ -23,6 +29,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) { @@ -34,4 +42,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); + } + } + } + } diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index dbdc3c1a..d8b5e17a 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -14,6 +14,8 @@ "text.autoconfig.skyblocker.option.general.richPresence": "Discord Rich Presence", "text.autoconfig.skyblocker.option.general.richPresence.info": "Skyblock Info", + "text.autoconfig.skyblocker.option.general.richPresence.info.@Tooltip": "This value doesn't matter if you are cycling", + "text.autoconfig.skyblocker.option.general.richPresence.cycleMode": "Cycle Skyblock Info", "text.autoconfig.skyblocker.option.general.richPresence.enableRichPresence": "Enabled", "text.autoconfig.skyblocker.option.general.richPresence.customMessage": "Custom Message", |