From 651fdf3eb7a59d9170fa11a104b73303780bcd85 Mon Sep 17 00:00:00 2001 From: vicisacat Date: Sat, 16 Mar 2024 18:23:29 +0100 Subject: Funky looking thing --- .../textures/gui/sprites/quick_craft/more_button.png | Bin 0 -> 210 bytes .../gui/sprites/quick_craft/more_button_disabled.png | Bin 0 -> 201 bytes .../gui/sprites/quick_craft/more_button_highlighted.png | Bin 0 -> 210 bytes .../gui/sprites/quick_craft/quick_craft_overlay.png | Bin 0 -> 250 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/quick_craft/more_button.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/quick_craft/more_button_disabled.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/quick_craft/more_button_highlighted.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/quick_craft/quick_craft_overlay.png (limited to 'src/main/resources/assets') diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/quick_craft/more_button.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/quick_craft/more_button.png new file mode 100644 index 00000000..7a6e3162 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/sprites/quick_craft/more_button.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/quick_craft/more_button_disabled.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/quick_craft/more_button_disabled.png new file mode 100644 index 00000000..02a22b4f Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/sprites/quick_craft/more_button_disabled.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/quick_craft/more_button_highlighted.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/quick_craft/more_button_highlighted.png new file mode 100644 index 00000000..be41b321 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/sprites/quick_craft/more_button_highlighted.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/quick_craft/quick_craft_overlay.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/quick_craft/quick_craft_overlay.png new file mode 100644 index 00000000..d8cf0c2b Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/sprites/quick_craft/quick_craft_overlay.png differ -- cgit From a0590e547cc9b033f1858afa6ca6d9d4c9e820b4 Mon Sep 17 00:00:00 2001 From: vicisacat Date: Tue, 2 Apr 2024 17:59:08 +0200 Subject: config --- src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java | 3 +++ .../de/hysky/skyblocker/config/categories/GeneralCategory.java | 7 +++++++ .../java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java | 6 +++--- src/main/resources/assets/skyblocker/lang/en_us.json | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) (limited to 'src/main/resources/assets') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 29678683..e696ef4f 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -159,6 +159,9 @@ public class SkyblockerConfig { @SerialEntry public boolean betterPartyFinder = true; + @SerialEntry + public boolean fancyCraftingUi = true; + @SerialEntry public boolean backpackPreviewWithoutShift = false; diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java index fe73a6a7..bd35c00c 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -55,6 +55,13 @@ public class GeneralCategory { newValue -> config.general.compactorDeletorPreview = newValue) .controller(ConfigUtils::createBooleanController) .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.fancyCraftingUi")) + .binding(defaults.general.fancyCraftingUi, + () -> config.general.fancyCraftingUi, + newValue -> config.general.fancyCraftingUi = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.general.hideEmptyTooltips")) .binding(defaults.general.hideEmptyTooltips, diff --git a/src/main/java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java b/src/main/java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java index 08a9ee6f..385b3950 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java @@ -22,11 +22,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public interface HandledScreenProviderMixin { @Inject(method = "open", at = @At("HEAD"), cancellable = true) default void skyblocker$open(Text name, ScreenHandlerType type, MinecraftClient client, int id, CallbackInfo ci) { - if (!SkyblockerConfigManager.get().general.betterPartyFinder) return; ClientPlayerEntity player = client.player; if (player == null) return; + if (!Utils.isOnSkyblock()) return; T screenHandler = type.create(id, player.getInventory()); - if (screenHandler instanceof GenericContainerScreenHandler containerScreenHandler && PartyFinderScreen.possibleInventoryNames.contains(name.getString().toLowerCase())) { + if (SkyblockerConfigManager.get().general.betterPartyFinder && screenHandler instanceof GenericContainerScreenHandler containerScreenHandler && PartyFinderScreen.possibleInventoryNames.contains(name.getString().toLowerCase())) { if (client.currentScreen != null) { String lowerCase = client.currentScreen.getTitle().getString().toLowerCase(); if (lowerCase.contains("group builder")) return; @@ -45,7 +45,7 @@ public interface HandledScreenProviderMixin { } ci.cancel(); - } else if (Utils.isOnSkyblock() && screenHandler instanceof GenericContainerScreenHandler containerScreenHandler && name.getString().toLowerCase().contains("craft item")) { + } else if (SkyblockerConfigManager.get().general.fancyCraftingUi && screenHandler instanceof GenericContainerScreenHandler containerScreenHandler && name.getString().toLowerCase().contains("craft item")) { SkyblockCraftingTableScreenHandler skyblockCraftingTableScreenHandler = new SkyblockCraftingTableScreenHandler(containerScreenHandler, player.getInventory()); client.player.currentScreenHandler = skyblockCraftingTableScreenHandler; client.setScreen(new SkyblockCraftingTableScreen(skyblockCraftingTableScreenHandler, player.getInventory(), Text.literal("Craft Item"))); diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index dd44b8fe..878b3652 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -154,6 +154,7 @@ "text.autoconfig.skyblocker.option.general.searchOverlay.enableCommands.@Tooltip": "Opens the bazaar search with \"/bzs\" and auction house with \"/ahs\". A re-log is required for this setting to be updated.", "text.autoconfig.skyblocker.option.general.searchOverlay.historyLabel": "History:", "text.autoconfig.skyblocker.option.general.betterPartyFinder": "Better Party Finder", + "text.autoconfig.skyblocker.option.general.fancyCraftingUi": "Fancy Crafting UI", "skyblocker.itemTooltip.nullMessage": "§cItem price information on tooltip will renew in max 60 seconds. If not, check latest.log", "skyblocker.itemTooltip.noData": "§cNo Data", -- cgit From 771f02b8d90181a298b84d6d64afcb8785fd7d0d Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Wed, 3 Apr 2024 16:51:00 -0400 Subject: Refactor Fancy Crafting Table --- .../java/de/hysky/skyblocker/config/SkyblockerConfig.java | 2 +- .../skyblocker/config/categories/GeneralCategory.java | 14 +++++++------- .../skyblocker/mixin/HandledScreenProviderMixin.java | 2 +- .../skyblock/item/SkyblockCraftingTableScreen.java | 15 +++++---------- src/main/resources/assets/skyblocker/lang/en_us.json | 2 +- 5 files changed, 15 insertions(+), 20 deletions(-) (limited to 'src/main/resources/assets') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index e696ef4f..644e97f2 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -160,7 +160,7 @@ public class SkyblockerConfig { public boolean betterPartyFinder = true; @SerialEntry - public boolean fancyCraftingUi = true; + public boolean fancyCraftingTable = true; @SerialEntry public boolean backpackPreviewWithoutShift = false; diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java index bd35c00c..adcb27a1 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -41,6 +41,13 @@ public class GeneralCategory { newValue -> config.general.betterPartyFinder = newValue) .controller(ConfigUtils::createBooleanController) .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.fancyCraftingTable")) + .binding(defaults.general.fancyCraftingTable, + () -> config.general.fancyCraftingTable, + newValue -> config.general.fancyCraftingTable = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift")) .binding(defaults.general.backpackPreviewWithoutShift, @@ -55,13 +62,6 @@ public class GeneralCategory { newValue -> config.general.compactorDeletorPreview = newValue) .controller(ConfigUtils::createBooleanController) .build()) - .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.general.fancyCraftingUi")) - .binding(defaults.general.fancyCraftingUi, - () -> config.general.fancyCraftingUi, - newValue -> config.general.fancyCraftingUi = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.general.hideEmptyTooltips")) .binding(defaults.general.hideEmptyTooltips, diff --git a/src/main/java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java b/src/main/java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java index 385b3950..975c9c51 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java @@ -45,7 +45,7 @@ public interface HandledScreenProviderMixin { } ci.cancel(); - } else if (SkyblockerConfigManager.get().general.fancyCraftingUi && screenHandler instanceof GenericContainerScreenHandler containerScreenHandler && name.getString().toLowerCase().contains("craft item")) { + } else if (SkyblockerConfigManager.get().general.fancyCraftingTable && screenHandler instanceof GenericContainerScreenHandler containerScreenHandler && name.getString().toLowerCase().contains("craft item")) { SkyblockCraftingTableScreenHandler skyblockCraftingTableScreenHandler = new SkyblockCraftingTableScreenHandler(containerScreenHandler, player.getInventory()); client.player.currentScreenHandler = skyblockCraftingTableScreenHandler; client.setScreen(new SkyblockCraftingTableScreen(skyblockCraftingTableScreenHandler, player.getInventory(), Text.literal("Craft Item"))); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreen.java index 95cbbf4a..14ddb238 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreen.java @@ -29,7 +29,8 @@ public class SkyblockCraftingTableScreen extends HandledScreen this.onMouseClick(handler.slots.get(26), handler.slots.get(26).id, 0, SlotActionType.PICKUP)); moreCraftsButton.setTooltipDelay(250); - moreCraftsButton.setTooltip(Tooltip.of(Text.literal("More crafts"))); + moreCraftsButton.setTooltip(Tooltip.of(Text.literal("More Crafts"))); this.addDrawableChild(moreCraftsButton); assert (client != null ? client.player : null) != null; client.player.currentScreenHandler = handler; // recipe book replaces it with the Dummy one fucking DUMBASS @@ -130,8 +131,6 @@ public class SkyblockCraftingTableScreen extends HandledScreen> recipe) { diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 878b3652..9ed5e4d0 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -154,7 +154,7 @@ "text.autoconfig.skyblocker.option.general.searchOverlay.enableCommands.@Tooltip": "Opens the bazaar search with \"/bzs\" and auction house with \"/ahs\". A re-log is required for this setting to be updated.", "text.autoconfig.skyblocker.option.general.searchOverlay.historyLabel": "History:", "text.autoconfig.skyblocker.option.general.betterPartyFinder": "Better Party Finder", - "text.autoconfig.skyblocker.option.general.fancyCraftingUi": "Fancy Crafting UI", + "text.autoconfig.skyblocker.option.general.fancyCraftingTable": "Fancy Crafting Table UI", "skyblocker.itemTooltip.nullMessage": "§cItem price information on tooltip will renew in max 60 seconds. If not, check latest.log", "skyblocker.itemTooltip.noData": "§cNo Data", -- cgit