reload world screen after closing browse page

root.gradle.kts

@@ -46,7 +46,7 @@ preprocess {
     val fabric12006 = createNode("1.20.6-fabric", 12006, "yarn")
     val fabric12101 = createNode("1.21.1-fabric", 12101, "yarn")
 
-    forge11202.link(forge10809)
+    forge11202.link(forge10809, file("versions/1.8.9-forge-1.12.2-forge"))
     forge11602.link(forge11202, file("versions/1.12.2-forge-1.16.2-forge"))
     forge11801.link(fabric11801)
     forge11902.link(fabric11902)

src/main/java/dev/dediamondpro/resourcify/mixins/WorldSelectionScreenAccessor.java

@@ -0,0 +1,35 @@
+/*
+ * This file is part of Resourcify
+ * Copyright (C) 2024 DeDiamondPro
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License Version 3 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package dev.dediamondpro.resourcify.mixins;
+
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiSelectWorld;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(GuiSelectWorld.class)
+public interface WorldSelectionScreenAccessor {
+    @Accessor(
+            //#if MC >= 11202
+            //$$ "prevScreen"
+            //#else
+            "parentScreen"
+            //#endif
+    )
+    GuiScreen getParentScreen();
+}

src/main/kotlin/dev/dediamondpro/resourcify/gui/projectpage/ProjectScreen.kt

@@ -27,6 +27,7 @@ import dev.dediamondpro.resourcify.elements.TextIcon
 import dev.dediamondpro.resourcify.gui.ConfirmLinkScreen
 import dev.dediamondpro.resourcify.gui.PaginatedScreen
 import dev.dediamondpro.resourcify.gui.projectpage.components.MemberCard
+import dev.dediamondpro.resourcify.mixins.WorldSelectionScreenAccessor
 import dev.dediamondpro.resourcify.platform.Platform
 import dev.dediamondpro.resourcify.services.IProject
 import dev.dediamondpro.resourcify.services.IService
@@ -39,10 +40,10 @@ import gg.essential.elementa.dsl.*
 import gg.essential.elementa.font.DefaultFonts
 import gg.essential.universal.ChatColor
 import gg.essential.universal.UDesktop
+import net.minecraft.client.gui.GuiSelectWorld
 import java.awt.Color
 import java.io.File
 import java.net.URI
-import java.net.URL
 import java.util.concurrent.CompletableFuture
 
 class ProjectScreen(
@@ -327,4 +328,12 @@ class ProjectScreen(
             }
         }
     }
+
+    override fun afterInitialization() {
+        // Required since world selection screen doesn't automatically update
+        if (type == ProjectType.WORLD) {
+            forwardScreens.replaceAll { if (it is GuiSelectWorld) GuiSelectWorld((it as WorldSelectionScreenAccessor).parentScreen) else it }
+            backScreens.replaceAll { if (it is GuiSelectWorld) GuiSelectWorld((it as WorldSelectionScreenAccessor).parentScreen) else it }
+        }
+    }
 }

src/main/resources/forge.mixins.resourcify.json

@@ -11,6 +11,7 @@
     "OptifineGuiShadersMixin",
     "PackScreenAccessor",
     "ReloadableResourceManagerMixin",
-    "AycyResourcePackManagerMixin"
+    "AycyResourcePackManagerMixin",
+    "WorldSelectionScreenAccessor"
   ]
 }

versions/1.12.2-forge-1.16.2-forge

@@ -1,4 +1,5 @@
 net.minecraft.resources.IResourceManager net.minecraft.client.resources.IResourceManager
 net.minecraft.resources.SimpleReloadableResourceManager net.minecraft.client.resources.SimpleReloadableResourceManager
 net.minecraft.client.gui.screen.PackScreen net.minecraft.client.gui.GuiScreenResourcePacks
-net.minecraft.client.gui.screen.Screen net.minecraft.client.gui.GuiScreen
+net.minecraft.client.gui.screen.Screen net.minecraft.client.gui.GuiScreen
+net.minecraft.client.gui.screen.WorldSelectionScreen net.minecraft.client.gui.GuiWorldSelection

versions/1.12.2-forge/src/main/resources/forge.mixins.resourcify.json

@@ -10,6 +10,7 @@
     "OptifineGuiShadersAccessor",
     "OptifineGuiShadersMixin",
     "PackScreenAccessor",
-    "ReloadableResourceManagerMixin"
+    "ReloadableResourceManagerMixin",
+    "WorldSelectionScreenAccessor"
   ]
 }

versions/1.16.2-fabric/src/main/resources/fabric.mixins.resourcify.json

@@ -5,6 +5,7 @@
   "client": [
     "ScreenMixin",
     "PackScreenAccessor",
-    "AbstractResourcePackAccessor"
+    "AbstractResourcePackAccessor",
+    "WorldSelectionScreenAccessor"
   ]
 }

versions/1.16.2-forge/src/main/resources/forge.mixins.resourcify.json

@@ -6,6 +6,7 @@
   "client": [
     "ScreenMixin",
     "PackScreenAccessor",
-    "AbstractResourcePackAccessor"
+    "AbstractResourcePackAccessor",
+    "WorldSelectionScreenAccessor"
   ]
 }

versions/1.19.4-fabric/src/main/resources/fabric.mixins.resourcify.json

@@ -6,6 +6,7 @@
     "ScreenMixin",
     "PackScreenAccessor",
     "AbstractResourcePackAccessor",
-    "ResourcePackOrganizerAccessor"
+    "ResourcePackOrganizerAccessor",
+    "WorldSelectionScreenAccessor"
   ]
 }

versions/1.19.4-fabric/src/main/resources/forge.mixins.resourcify.json

@@ -7,6 +7,7 @@
     "ScreenMixin",
     "PackScreenAccessor",
     "AbstractResourcePackAccessor",
-    "ResourcePackOrganizerAccessor"
+    "ResourcePackOrganizerAccessor",
+    "WorldSelectionScreenAccessor"
   ]
 }

versions/1.21.1-fabric/src/main/resources/forge.mixins.resourcify.json

@@ -6,6 +6,7 @@
     "ScreenMixin",
     "PackScreenAccessor",
     "AbstractResourcePackAccessor",
-    "ResourcePackOrganizerAccessor"
+    "ResourcePackOrganizerAccessor",
+    "WorldSelectionScreenAccessor"
   ]
 }

versions/1.8.9-forge-1.12.2-forge

@@ -0,0 +1 @@
+net.minecraft.client.gui.GuiWorldSelection net.minecraft.client.gui.GuiSelectWorld