Refactor Fancy Crafting Table

5 files changed, 15 insertions, 20 deletions

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
@@ -42,6 +42,13 @@ public class GeneralCategory {
 						.controller(ConfigUtils::createBooleanController)
 						.build())
 				.option(Option.<Boolean>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.<Boolean>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift"))
 						.binding(defaults.general.backpackPreviewWithoutShift,
 								() -> config.general.backpackPreviewWithoutShift,
@@ -56,13 +63,6 @@ public class GeneralCategory {
 						.controller(ConfigUtils::createBooleanController)
 						.build())
 				.option(Option.<Boolean>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.<Boolean>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.general.hideEmptyTooltips"))
 						.binding(defaults.general.hideEmptyTooltips,
 								() -> config.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<T extends ScreenHandler> {
             }
 
             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<SkyblockCraftingT
     protected static final ButtonTextures MORE_CRAFTS_TEXTURES = new ButtonTextures(
             new Identifier(SkyblockerMod.NAMESPACE, "quick_craft/more_button"),
             new Identifier(SkyblockerMod.NAMESPACE, "quick_craft/more_button_disabled"),
-            new Identifier(SkyblockerMod.NAMESPACE, "quick_craft/more_button_highlighted"));
+            new Identifier(SkyblockerMod.NAMESPACE, "quick_craft/more_button_highlighted")
+    );
 
     protected static final Identifier QUICK_CRAFT = new Identifier(SkyblockerMod.NAMESPACE, "quick_craft/quick_craft_overlay");
     private final ItemListWidget recipeBook = new ItemListWidget();
@@ -56,7 +57,7 @@ public class SkyblockCraftingTableScreen extends HandledScreen<SkyblockCraftingT
         moreCraftsButton = new TexturedButtonWidget(this.x + 174, y + 62, 16, 16, MORE_CRAFTS_TEXTURES,
                 button -> 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<SkyblockCraftingT
     protected void onMouseClick(Slot slot, int slotId, int button, SlotActionType actionType) {
         super.onMouseClick(slot, slotId, button, actionType);
         this.recipeBook.slotClicked(slot);
-        // Don't make the more item head skull thing show up
-        if (slot != null && slot.id == 26) handler.setCursorStack(ItemStack.EMPTY);
     }
 
 
@@ -142,14 +141,10 @@ public class SkyblockCraftingTableScreen extends HandledScreen<SkyblockCraftingT
         }
 
         @Override
-        public void populateRecipeFinder(RecipeMatcher finder) {
-
-        }
+        public void populateRecipeFinder(RecipeMatcher finder) {}
 
         @Override
-        public void clearCraftingSlots() {
-
-        }
+        public void clearCraftingSlots() {}
 
         @Override
         public boolean matches(RecipeEntry<? extends Recipe<SimpleInventory>> 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",