From 5ff6d2c2e51e1e503f5f7929668074ec2f276ecc Mon Sep 17 00:00:00 2001 From: KonaeAkira Date: Thu, 27 Jan 2022 14:10:30 +0100 Subject: Import itemlist from https://github.com/KonaeAkira/Skypixel --- src/main/resources/skyblocker.mixins.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/resources') diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json index abc219fa..6da4efb2 100644 --- a/src/main/resources/skyblocker.mixins.json +++ b/src/main/resources/skyblocker.mixins.json @@ -11,7 +11,8 @@ "AccessorWorldRenderer", "GenericContainerScreenMixin", "GenericContainerScreenHandlerMixin", - "LeverBlockMixin" + "LeverBlockMixin", + "HandledScreenMixin" ], "injectors": { "defaultRequire": 1 -- cgit From fe5e15db3678007c35980b4f04b6879d0c996eb3 Mon Sep 17 00:00:00 2001 From: KonaeAkira Date: Thu, 27 Jan 2022 17:36:27 +0100 Subject: Add item list toggle config & isSkyblock check --- src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 8 ++++++++ .../java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java | 6 +++++- src/main/resources/assets/skyblocker/lang/en_us.json | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) (limited to 'src/main/resources') diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 74cff226..9c817d44 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -31,6 +31,10 @@ public class SkyblockerConfig implements ConfigData { @ConfigEntry.Gui.CollapsibleObject(startExpanded = true) public Bars bars = new Bars(); + @ConfigEntry.Category("itemList") + @ConfigEntry.Gui.CollapsibleObject(startExpanded = true) + public ItemList itemList = new ItemList(); + @ConfigEntry.Gui.Excluded public List lockedSlots = new ArrayList<>(); } @@ -39,6 +43,10 @@ public class SkyblockerConfig implements ConfigData { public boolean enableBars = true; } + public static class ItemList { + public boolean enableItemList = true; + } + public static class Locations { @ConfigEntry.Category("dungeons") @ConfigEntry.Gui.CollapsibleObject(startExpanded = true) diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java index a1683701..0ed976f3 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java @@ -1,6 +1,8 @@ package me.xmrvizzy.skyblocker.mixin; +import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import me.xmrvizzy.skyblocker.skyblock.itemlist.ItemListWidget; +import me.xmrvizzy.skyblocker.utils.Utils; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.text.Text; @@ -17,6 +19,8 @@ public abstract class HandledScreenMixin extends Screen { @Inject(method = "init()V", at = @At("TAIL")) private void init(CallbackInfo ci) { - super.addDrawableChild(new ItemListWidget((HandledScreen)(Object)this)); + if (Utils.isSkyblock && SkyblockerConfig.get().general.itemList.enableItemList) { + super.addDrawableChild(new ItemListWidget((HandledScreen)(Object)this)); + } } } diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 680787e8..cdca7822 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -9,6 +9,8 @@ "text.autoconfig.skyblocker.option.general.apiKey": "Hypixel API Key (WIP)", "text.autoconfig.skyblocker.option.general.bars": "Health, Mana, Defence & XP Bars", "text.autoconfig.skyblocker.option.general.bars.enableBars": "Enable Bars", + "text.autoconfig.skyblocker.option.general.itemList": "Item List", + "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "Enable Item List", "text.autoconfig.skyblocker.category.locations": "Locations", "text.autoconfig.skyblocker.option.locations.dungeons": "Dungeons", -- cgit