fixed something

Author: JaisDK

gradle.properties

@@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 minecraft_version=1.20.1
-forge_version=47.2.0
+forge_version=47.4.0
 mapping_channel=official
 mapping_version=1.20.1
 
 group=invtweaks
 mod_id=invtweaks
-version=1.2.0
+version=1.2.2

src/main/java/invtweaks/config/InvTweaksConfig.java

@@ -85,10 +85,12 @@ public class InvTweaksConfig {
                     .put("com.direwolf20.laserio.client.screens.*", new ContOverride(NO_POS_OVERRIDE, NO_POS_OVERRIDE, ""))
                     .put("com.stal111.forbidden_arcanus.client.gui.screen.*", new ContOverride(NO_POS_OVERRIDE, NO_POS_OVERRIDE, ""))
                     .put("aztech.modern_industrialization.*.gui.*Screen", new ContOverride(NO_POS_OVERRIDE, NO_POS_OVERRIDE, ""))
+                    .put("slimeknights.tconstruct.smeltery.client.screen.HeatingStructureScreen", new ContOverride(41, 0, ""))
                     .build();
 
     private static final ForgeConfigSpec.ConfigValue<List<? extends UnmodifiableConfig>> CATS;
     private static final ForgeConfigSpec.ConfigValue<List<? extends String>> RULES;
+    private static final ForgeConfigSpec.BooleanValue ENABLE_DEBUG;
     private static final ForgeConfigSpec.BooleanValue ENABLE_AUTOREFILL;
     private static final ForgeConfigSpec.BooleanValue ENABLE_QUICKVIEW;
     private static final ForgeConfigSpec.IntValue ENABLE_SORT;
@@ -179,6 +181,7 @@ public class InvTweaksConfig {
         {
             builder.comment("Tweaks").push("tweaks");
 
+            ENABLE_DEBUG = builder.comment("Enable debug will log the name of the screens being opened").define("enableDebug", false);
             ENABLE_AUTOREFILL = builder.comment("Enable auto-refill").define("autoRefill", true);
             ENABLE_QUICKVIEW =
                     builder
@@ -346,6 +349,10 @@ public static boolean isQuickViewEnabled() {
         return ENABLE_QUICKVIEW.get();
     }
 
+    public static boolean isDebugEnabled() {
+        return CLIENT_CONFIG.isLoaded() && ENABLE_DEBUG.get();
+    }
+
     public static Map<String, Category> cfgToCompiledCats(List<UnmodifiableConfig> lst) {
         Map<String, Category> catsMap = new LinkedHashMap<>();
         for (UnmodifiableConfig subCfg : lst) {

src/main/java/invtweaks/events/ClientEvents.java

@@ -79,29 +79,26 @@ private static void requestSort(boolean isPlayer, String screenClass) {
     @SubscribeEvent
     public static void onScreenEventInit(ScreenEvent.Init.Post event) {
         if (event.getScreen() instanceof AbstractContainerScreen<?> screen && !(screen instanceof CreativeModeInventoryScreen)) {
+            ContOverride override = InvTweaksConfig.getPlayerContOverride(Minecraft.getInstance().player, screen.getClass().getName(), screen.getMenu().getClass().getName());
+            var isSortDisabled = Optional.ofNullable(override).filter(ContOverride::isSortDisabled).isPresent();
+
             // first, work with player inventory
             Slot placement = getDefaultButtonPlacement(screen.getMenu().slots, slot -> slot.container instanceof Inventory);
             if (placement != null
                     && InvTweaksConfig.isSortEnabled(true)
                     && InvTweaksConfig.isButtonEnabled(true)) {
                 try {
-                    event.addListener(
-                            new InvTweaksButtonSort(
-                                    screen.getGuiLeft() + placement.x + 17,
-                                    screen.getGuiTop() + placement.y,
-                                    btn -> requestSort(true, screen.getClass().getName())));
+                    int x = screen.getGuiLeft() + placement.x + 17 + (isSortDisabled ? override.getX() : 0);
+                    int y = screen.getGuiTop() + placement.y + (isSortDisabled ? override.getY() : 0);
+                    event.addListener(new InvTweaksButtonSort(x, y, btn -> requestSort(true, screen.getClass().getName())));
                 } catch (Exception e) {
                     Throwables.throwIfUnchecked(e);
                     throw new RuntimeException(e);
                 }
             }
 
             // then, work with external inventory
-            InvTweaksMod.LOGGER.info(screen.getClass().getName());
-            ContOverride override = InvTweaksConfig.getPlayerContOverride(Minecraft.getInstance().player, screen.getClass().getName(), screen.getMenu().getClass().getName());
-            var isSortDisabled = Optional.ofNullable(override).filter(ContOverride::isSortDisabled).isPresent();
-
-            if (!(screen instanceof EffectRenderingInventoryScreen) && !isSortDisabled) {
+            if (!isSortDisabled && !(screen instanceof EffectRenderingInventoryScreen)) {
                 int x = InvTweaksConfig.NO_POS_OVERRIDE, y = InvTweaksConfig.NO_POS_OVERRIDE;
                 if (override != null) {
                     x = override.getX();

src/main/java/invtweaks/network/PacketUpdateConfig.java

@@ -81,7 +81,6 @@ public void handle(Supplier<NetworkEvent.Context> ctx) {
                             InvTweaksConfig.setPlayerContOverrides(
                                     Objects.requireNonNull(ctx.get().getSender()),
                                     InvTweaksConfig.cfgToCompiledContOverrides(contOverrides));
-                            // InvTweaksMod.LOGGER.info("Received config from client!");
                         });
         ctx.get().setPacketHandled(true);
     }

src/main/java/invtweaks/util/Sorting.java

@@ -4,6 +4,7 @@
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.Streams;
+import invtweaks.InvTweaksMod;
 import invtweaks.config.Category;
 import invtweaks.config.ContOverride;
 import invtweaks.config.InvTweaksConfig;
@@ -33,6 +34,9 @@ private Sorting() {
     }
 
     public static void executeSort(Player player, boolean isPlayerSort, String screenClass) {
+        if (player != null && InvTweaksConfig.isDebugEnabled()) {
+            InvTweaksMod.LOGGER.debug("screen: " + screenClass);
+        }
         if (isPlayerSort) {
             Map<String, Category> cats = InvTweaksConfig.getPlayerCats(player);
             Ruleset rules = InvTweaksConfig.getPlayerRules(player);