Store + reapply client window pos for synced windows (#80)

* Store + reapply client window pos for synced windows

* update

* reviews + rework logic

* cleanup

* fix

* update

* Update ModularUIContext.java

---------

Co-authored-by: Martin Robertz <dream-master@gmx.net>

Author: serenibyss

dependencies.gradle

@@ -3,11 +3,11 @@
 dependencies {
     api("org.jetbrains:annotations:23.0.0")
 
-    api("com.github.GTNewHorizons:NotEnoughItems:2.6.35-GTNH:dev")
+    api("com.github.GTNewHorizons:NotEnoughItems:2.6.38-GTNH:dev")
 
-    implementation("com.github.GTNewHorizons:GTNHLib:0.5.5:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.60:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.84:dev") {
+    implementation("com.github.GTNewHorizons:GTNHLib:0.5.11:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.62:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.111:dev") {
         transitive = false
         exclude group:"com.github.GTNewHorizons", module:"ModularUI"
     }

src/main/java/com/gtnewhorizons/modularui/api/screen/ModularUIContext.java

@@ -45,6 +45,7 @@ public class ModularUIContext {
     private final Deque<ModularWindow> windows = new LinkedList<>();
     private final BiMap<Integer, ModularWindow> syncedWindows = HashBiMap.create(4);
     private final Map<ModularWindow, Pos2d> lastWindowPos = new HashMap<>();
+    private final Map<Integer, Pos2d> lastSyncedWindowPos = new HashMap<>();
     private ModularWindow mainWindow;
 
     @SideOnly(Side.CLIENT)
@@ -270,7 +271,12 @@ public void closeAllButMain() {
 
     public void storeWindowPos(ModularWindow window, Pos2d pos) {
         if (windows.contains(window)) {
-            this.lastWindowPos.put(window, pos);
+            Integer id = syncedWindows.inverse().get(window);
+            if (id != null) {
+                this.lastSyncedWindowPos.put(id, pos);
+            } else {
+                this.lastWindowPos.put(window, pos);
+            }
         }
     }
 
@@ -279,6 +285,12 @@ public boolean tryApplyStoredPos(ModularWindow window) {
         if (this.lastWindowPos.containsKey(window)) {
             window.setPos(this.lastWindowPos.get(window));
             return true;
+        } else {
+            Integer id = syncedWindows.inverse().get(window);
+            if (id != null && this.lastSyncedWindowPos.containsKey(id)) {
+                window.setPos(this.lastSyncedWindowPos.get(id));
+                return true;
+            }
         }
         return false;
     }