fix: Remove the wrong "Pair" and use Apache Commons

feat: add New InventoryOverlayHandler system; which now makes Tweakeroo's InventoryPreview work the same as MiniHUD.
sakura-ryoko · Dec 30, 2024 · 7269d1d · 7269d1d
1 parent b9b006f
commit 7269d1d
Show file tree

Hide file tree

Showing 13 changed files with 570 additions and 532 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,10 +9,10 @@ author = masa
 mod_file_name = tweakeroo-fabric
 
 # Current mod version
-mod_version = 0.21.55
+mod_version = 0.21.56
 
 # Required malilib version
-malilib_version = 3f02eb2ef6
+malilib_version = 1.21-0.21.6
 
 # Minecraft, Fabric Loader and API and mappings versions
 minecraft_version_out = 1.21

diff --git a/src/main/java/fi/dy/masa/tweakeroo/config/Callbacks.java b/src/main/java/fi/dy/masa/tweakeroo/config/Callbacks.java
@@ -10,27 +10,20 @@
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
-import fi.dy.masa.malilib.config.IConfigBase;
+
 import fi.dy.masa.malilib.config.IConfigBoolean;
-import fi.dy.masa.malilib.config.IHotkeyTogglable;
 import fi.dy.masa.malilib.config.options.ConfigBoolean;
 import fi.dy.masa.malilib.gui.GuiBase;
-import fi.dy.masa.malilib.hotkeys.IHotkeyCallback;
-import fi.dy.masa.malilib.hotkeys.IKeybind;
-import fi.dy.masa.malilib.hotkeys.KeyAction;
-import fi.dy.masa.malilib.hotkeys.KeyCallbackAdjustable;
-import fi.dy.masa.malilib.hotkeys.KeyCallbackToggleBooleanConfigWithMessage;
+import fi.dy.masa.malilib.hotkeys.*;
 import fi.dy.masa.malilib.interfaces.IValueChangeCallback;
+import fi.dy.masa.malilib.render.InventoryOverlayScreen;
 import fi.dy.masa.malilib.util.InfoUtils;
 import fi.dy.masa.malilib.util.StringUtils;
 import fi.dy.masa.tweakeroo.gui.GuiConfigs;
 import fi.dy.masa.tweakeroo.mixin.IMixinAbstractBlock;
 import fi.dy.masa.tweakeroo.mixin.IMixinSimpleOption;
-import fi.dy.masa.tweakeroo.util.CameraEntity;
-import fi.dy.masa.tweakeroo.util.InventoryUtils;
-import fi.dy.masa.tweakeroo.util.MiscUtils;
-import fi.dy.masa.tweakeroo.util.PlacementRestrictionMode;
-import fi.dy.masa.tweakeroo.util.SnapAimMode;
+import fi.dy.masa.tweakeroo.renderer.InventoryOverlayHandler;
+import fi.dy.masa.tweakeroo.util.*;
 
 public class Callbacks
 {
@@ -82,6 +75,7 @@ public static void init(MinecraftClient mc)
         Hotkeys.HOTBAR_SWAP_2.getKeybind().setCallback(callbackGeneric);
         Hotkeys.HOTBAR_SWAP_3.getKeybind().setCallback(callbackGeneric);
         Hotkeys.HOTBAR_SCROLL.getKeybind().setCallback(callbackGeneric);
+        Hotkeys.INVENTORY_PREVIEW_TOGGLE_SCREEN.getKeybind().setCallback(callbackGeneric);
         Hotkeys.OPEN_CONFIG_GUI.getKeybind().setCallback(callbackGeneric);
         Hotkeys.PLACEMENT_RESTRICTION_MODE_COLUMN.getKeybind().setCallback(callbackGeneric);
         Hotkeys.PLACEMENT_RESTRICTION_MODE_DIAGONAL.getKeybind().setCallback(callbackGeneric);
@@ -448,6 +442,18 @@ else if (key == Hotkeys.ZOOM_ACTIVATE.getKeybind())
                             //String.format("%s%.1f%s", GuiBase.TXT_GREEN, Configs.Generic.ZOOM_FOV.getDoubleValue(), GuiBase.TXT_RST));
                 }
             }
+            else if (key == Hotkeys.INVENTORY_PREVIEW_TOGGLE_SCREEN.getKeybind())
+            {
+                if (mc.currentScreen instanceof InventoryOverlayScreen)
+                {
+                    mc.setScreen(null);
+                }
+                else if (FeatureToggle.TWEAK_INVENTORY_PREVIEW.getBooleanValue() &&
+                         Hotkeys.INVENTORY_PREVIEW.getKeybind().isKeybindHeld())
+                {
+                    InventoryOverlayHandler.getInstance().refreshInventoryOverlay(mc, Configs.Generic.SHULKER_DISPLAY_BACKGROUND_COLOR.getBooleanValue());
+                }
+            }
 
             return false;
         }

diff --git a/src/main/java/fi/dy/masa/tweakeroo/config/Hotkeys.java b/src/main/java/fi/dy/masa/tweakeroo/config/Hotkeys.java
@@ -37,6 +37,7 @@ public class Hotkeys
     public static final ConfigHotkey HOTBAR_SWAP_2                      = new ConfigHotkey("hotbarSwap2",                       "").apply(HOTKEY_KEY);
     public static final ConfigHotkey HOTBAR_SWAP_3                      = new ConfigHotkey("hotbarSwap3",                       "").apply(HOTKEY_KEY);
     public static final ConfigHotkey INVENTORY_PREVIEW                  = new ConfigHotkey("inventoryPreview",                  "LEFT_ALT", KeybindSettings.PRESS_ALLOWEXTRA).apply(HOTKEY_KEY);
+    public static final ConfigHotkey INVENTORY_PREVIEW_TOGGLE_SCREEN    = new ConfigHotkey("inventoryPreviewToggleScreen",      "BUTTON_3", KeybindSettings.create(KeybindSettings.Context.ANY, KeyAction.PRESS, true, true, false, true)).apply(HOTKEY_KEY);
     public static final ConfigHotkey OPEN_CONFIG_GUI                    = new ConfigHotkey("openConfigGui",                     "X,C").apply(HOTKEY_KEY);
     public static final ConfigHotkey PLACEMENT_Y_MIRROR                 = new ConfigHotkey("placementYMirror",                  "", KeybindSettings.PRESS_ALLOWEXTRA).apply(HOTKEY_KEY);
     public static final ConfigHotkey PLAYER_INVENTORY_PEEK              = new ConfigHotkey("playerInventoryPeek",               "", KeybindSettings.PRESS_ALLOWEXTRA).apply(HOTKEY_KEY);
@@ -83,6 +84,7 @@ public class Hotkeys
             HOTBAR_SWAP_2,
             HOTBAR_SWAP_3,
             INVENTORY_PREVIEW,
+            INVENTORY_PREVIEW_TOGGLE_SCREEN,
             OPEN_CONFIG_GUI,
             PLACEMENT_Y_MIRROR,
             PLAYER_INVENTORY_PEEK,

diff --git a/src/main/java/fi/dy/masa/tweakeroo/data/ServerDataSyncer.java b/src/main/java/fi/dy/masa/tweakeroo/data/ServerDataSyncer.java
@@ -2,7 +2,7 @@
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import com.llamalad7.mixinextras.lib.apache.commons.tuple.Pair;
+import org.apache.commons.lang3.tuple.Pair;
 import org.jetbrains.annotations.Nullable;
 
 import com.mojang.datafixers.util.Either;
@@ -35,6 +35,7 @@
 import net.minecraft.world.World;
 
 import fi.dy.masa.malilib.interfaces.IClientTickHandler;
+import fi.dy.masa.malilib.interfaces.IDataSyncer;
 import fi.dy.masa.malilib.network.ClientPlayHandler;
 import fi.dy.masa.malilib.network.IPluginClientPlayHandler;
 import fi.dy.masa.malilib.util.Constants;
@@ -52,7 +53,7 @@
 import fi.dy.masa.tweakeroo.network.ServuxTweaksPacket;
 
 @SuppressWarnings({"deprecation"})
-public class ServerDataSyncer implements IClientTickHandler
+public class ServerDataSyncer implements IClientTickHandler, IDataSyncer
 {
     private static final ServerDataSyncer INSTANCE = new ServerDataSyncer();
     public static ServerDataSyncer getInstance()
@@ -78,13 +79,15 @@ public static ServerDataSyncer getInstance()
     private final Map<Integer, Either<BlockPos, Integer>> transactionToBlockPosOrEntityId = new HashMap<>();
     private ClientWorld clientWorld;
 
+    @Override
     @Nullable
     public World getWorld()
     {
         return WorldUtils.getBestWorld(mc);
     }
 
-    private ClientWorld getClientWorld()
+    @Override
+    public ClientWorld getClientWorld()
     {
         if (this.clientWorld == null)
         {
@@ -182,6 +185,7 @@ public IPluginClientPlayHandler<ServuxTweaksPacket.Payload> getNetworkHandler()
         return HANDLER;
     }
 
+    @Override
     public void reset(boolean isLogout)
     {
         if (isLogout)
@@ -247,6 +251,7 @@ private void tickCache()
         }
     }
 
+    @Override
     public @Nullable NbtCompound getFromBlockEntityCacheNbt(BlockPos pos)
     {
         if (this.blockEntityCache.containsKey(pos))
@@ -257,6 +262,7 @@ private void tickCache()
         return null;
     }
 
+    @Override
     public @Nullable BlockEntity getFromBlockEntityCache(BlockPos pos)
     {
         if (this.blockEntityCache.containsKey(pos))
@@ -267,6 +273,7 @@ private void tickCache()
         return null;
     }
 
+    @Override
     public @Nullable NbtCompound getFromEntityCacheNbt(int entityId)
     {
         if (this.entityCache.containsKey(entityId))
@@ -277,6 +284,7 @@ private void tickCache()
         return null;
     }
 
+    @Override
     public @Nullable Entity getFromEntityCache(int entityId)
     {
         if (this.entityCache.containsKey(entityId))
@@ -336,12 +344,14 @@ public int getEntityCacheCount()
         return this.entityCache.size();
     }
 
+    @Override
     public void onGameInit()
     {
         ClientPlayHandler.getInstance().registerClientPlayHandler(HANDLER);
         HANDLER.registerPlayPayload(ServuxTweaksPacket.Payload.ID, ServuxTweaksPacket.Payload.CODEC, IPluginClientPlayHandler.BOTH_CLIENT);
     }
 
+    @Override
     public void onWorldPre()
     {
         if (DataManager.getInstance().hasIntegratedServer() == false)
@@ -350,6 +360,7 @@ public void onWorldPre()
         }
     }
 
+    @Override
     public void onWorldJoin()
     {
         // NO-OP
@@ -398,6 +409,7 @@ public void onPacketFailure()
         this.hasInValidServux = true;
     }
 
+    @Override
     public @Nullable Pair<BlockEntity, NbtCompound> requestBlockEntity(World world, BlockPos pos)
     {
         if (this.blockEntityCache.containsKey(pos))
@@ -431,14 +443,15 @@ else if (world.getBlockState(pos).getBlock() instanceof BlockEntityProvider)
         return null;
     }
 
-    public @Nullable Pair<Entity, NbtCompound> requestEntity(int entityId)
+    @Override
+    public @Nullable Pair<Entity, NbtCompound> requestEntity(World world, int entityId)
     {
         if (this.entityCache.containsKey(entityId))
         {
             return this.entityCache.get(entityId).getRight();
         }
         if (DataManager.getInstance().hasIntegratedServer() == false &&
-                FeatureToggle.TWEAK_SERVER_DATA_SYNC.getBooleanValue())
+            FeatureToggle.TWEAK_SERVER_DATA_SYNC.getBooleanValue())
         {
             this.pendingEntitiesQueue.add(entityId);
         }
@@ -464,6 +477,7 @@ else if (world.getBlockState(pos).getBlock() instanceof BlockEntityProvider)
         return null;
     }
 
+    @Override
     @Nullable
     public Inventory getBlockInventory(World world, BlockPos pos, boolean useNbt)
     {
@@ -536,8 +550,9 @@ public Inventory getBlockInventory(World world, BlockPos pos, boolean useNbt)
         return null;
     }
 
+    @Override
     @Nullable
-    public Inventory getEntityInventory(int entityId, boolean useNbt)
+    public Inventory getEntityInventory(World world, int entityId, boolean useNbt)
     {
         if (this.entityCache.containsKey(entityId) && this.getWorld() != null)
         {
@@ -581,7 +596,7 @@ else if (entity instanceof PiglinEntity)
 
         if (FeatureToggle.TWEAK_SERVER_DATA_SYNC.getBooleanValue())
         {
-            this.requestEntity(entityId);
+            this.requestEntity(world, entityId);
         }
 
         return null;
@@ -641,6 +656,7 @@ private void requestServuxEntityData(int entityId)
         }
     }
 
+    @Override
     @Nullable
     public BlockEntity handleBlockEntityData(BlockPos pos, NbtCompound nbt, @Nullable Identifier type)
     {
@@ -717,6 +733,7 @@ public BlockEntity handleBlockEntityData(BlockPos pos, NbtCompound nbt, @Nullabl
         return null;
     }
 
+    @Override
     @Nullable
     public Entity handleEntityData(int entityId, NbtCompound nbt)
     {
@@ -750,11 +767,13 @@ public Entity handleEntityData(int entityId, NbtCompound nbt)
         return entity;
     }
 
+    @Override
     public void handleBulkEntityData(int transactionId, NbtCompound nbt)
     {
         // todo
     }
 
+    @Override
     public void handleVanillaQueryNbt(int transactionId, NbtCompound nbt)
     {
         Either<BlockPos, Integer> either = this.transactionToBlockPosOrEntityId.remove(transactionId);

diff --git a/src/main/java/fi/dy/masa/tweakeroo/event/RenderHandler.java b/src/main/java/fi/dy/masa/tweakeroo/event/RenderHandler.java
@@ -1,7 +1,8 @@
 package fi.dy.masa.tweakeroo.event;
 
-import com.llamalad7.mixinextras.lib.apache.commons.tuple.Pair;
 import com.mojang.blaze3d.systems.RenderSystem;
+
+import org.apache.commons.lang3.tuple.Pair;
 import org.joml.Matrix4f;
 
 import net.minecraft.client.MinecraftClient;
@@ -21,7 +22,6 @@
 
 import fi.dy.masa.malilib.gui.GuiBase;
 import fi.dy.masa.malilib.interfaces.IRenderer;
-import fi.dy.masa.malilib.render.InventoryOverlay;
 import fi.dy.masa.malilib.util.ActiveMode;
 import fi.dy.masa.malilib.util.Color4f;
 import fi.dy.masa.malilib.util.InventoryUtils;
@@ -31,8 +31,8 @@
 import fi.dy.masa.tweakeroo.config.FeatureToggle;
 import fi.dy.masa.tweakeroo.config.Hotkeys;
 import fi.dy.masa.tweakeroo.data.ServerDataSyncer;
+import fi.dy.masa.tweakeroo.renderer.InventoryOverlayHandler;
 import fi.dy.masa.tweakeroo.renderer.RenderUtils;
-import fi.dy.masa.tweakeroo.util.RayTraceUtils;
 
 public class RenderHandler implements IRenderer
 {
@@ -68,12 +68,16 @@ else if (FeatureToggle.TWEAK_HOTBAR_SCROLL.getBooleanValue() &&
         if (FeatureToggle.TWEAK_INVENTORY_PREVIEW.getBooleanValue() &&
             Hotkeys.INVENTORY_PREVIEW.getKeybind().isKeybindHeld())
         {
+            /*
             InventoryOverlay.Context context = RayTraceUtils.getTargetInventory(mc);
 
             if (context != null)
             {
                 RenderUtils.renderInventoryOverlay(context, drawContext);
             }
+             */
+
+            InventoryOverlayHandler.getInstance().getRenderContext(drawContext, mc.getProfiler(), mc);
         }
 
         if (FeatureToggle.TWEAK_PLAYER_INVENTORY_PEEK.getBooleanValue() &&
@@ -133,7 +137,7 @@ else if (stack.isOf(Items.ENDER_CHEST) && Configs.Generic.SHULKER_DISPLAY_ENDER_
 
                 if (player != null)
                 {
-                    Pair<Entity, NbtCompound> pair = ServerDataSyncer.getInstance().requestEntity(player.getId());
+                    Pair<Entity, NbtCompound> pair = ServerDataSyncer.getInstance().requestEntity(world, player.getId());
                     NbtCompound nbt = new NbtCompound();
                     EnderChestInventory inv;