26.2 fabric port

Author: DeDiamondPro

build.gradle.kts

@@ -79,7 +79,6 @@ val shadeModImplementation: Configuration by configurations.creating {
 
 // Version definitions
 val mcVersion = VersionDefinition( // Used for pre releases and release candidates
-    "26.2" to "26.2-pre-4",
     default = mcPlatform.versionString
 )
 val compatibleMcVersion = VersionDefinition(
@@ -93,7 +92,7 @@ val compatibleMcVersion = VersionDefinition(
     "1.21.10" to VersionRange("1.21.9", "1.21.10", name = "1.21.10"),
     "1.21.11" to VersionRange("1.21.11", "1.21.11", name = "1.21.11"),
     "26.1.2" to VersionRange("26.1", "26.1.2", exclusiveUpperBound = "26.2", name = "26.1"),
-    "26.2" to VersionRange("26.2", "26.2", exclusiveUpperBound = "26.3", name = "26.2", allowAll = true),
+    "26.2" to VersionRange("26.2", "26.2", exclusiveUpperBound = "26.3", name = "26.2"),
 )
 val javaVersion = VersionDefinition(
     "1.20.1" to "17",
@@ -117,7 +116,7 @@ val fabricApiVersion = VersionDefinition(
     "1.21.10" to "0.136.0+1.21.10",
     "1.21.11" to "0.139.4+1.21.11",
     "26.1.2" to "0.150.0+26.1.2",
-    "26.2" to "0.150.3+26.2",
+    "26.2" to "0.152.1+26.2",
 )
 val modMenuVersion = VersionDefinition(
     "1.20.1" to "7.2.2",
@@ -166,10 +165,7 @@ val universalVersion = VersionDefinition(
     default = mcPlatform.versionString
 ).let {
     VersionDefinition(
-        "1.21.11-neoforge" to "1.21.11-neoforge:499+DIAMOND-NEO",
-        "26.1.2-neoforge" to "26.1-fabric:499",
-        "26.2" to "${it.get(mcPlatform)}-${mcPlatform.loaderString}:500+feature-mc-26.2-snapshot-7",
-        default = "${it.get(mcPlatform)}-${mcPlatform.loaderString}:499"
+        default = "${it.get(mcPlatform)}-${mcPlatform.loaderString}:505"
     )
 }
 

changelog.md

@@ -1,16 +1,10 @@
-## Resourcify 1.8.3
+## Resourcify 1.8.4
 
 Please make sure to report any bugs and/or visual anomalies
 on [Resourcify's GitHub](https://github.com/DeDiamondPro/Resourcify/issues) or in
 the [Discord](https://dediamondpro.dev/discord).
 
-- Resourcify now contributes to Modrinth's analytics,
-  see [their article](https://modrinth.com/news/article/analytics-overhaul/) for more info.
-- Ported to 1.21.11 and 26.1.2 NeoForge
-- Fixed download progress being stuck at 0% sometimes.
-- Added a search debounce to prevent sending a lot of requests when typing fast
-- Fixed issues with trying to open links with special characters.
-- Updated a lot of dependencies
+- Ported Resourcify to 26.2 fabric!
 
 ----------------------------------------------------------------------------------------------------
 

gradle.properties

@@ -1,6 +1,6 @@
 mod_name = Resourcify
 mod_id = resourcify
-mod_version = 1.8.3
+mod_version = 1.8.4
 
 org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true

settings.gradle.kts

@@ -61,7 +61,7 @@ stonecutter {
         for (version in platforms) {
             version(version, version.split('-')[0])
         }
-        vcsVersion = "26.1.2-fabric"
+        vcsVersion = "26.2-fabric"
     }
 }
 

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

@@ -12,9 +12,15 @@
 public class CreateWorldScreenMixin {
     @ModifyArg(
             method = "init",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/tabs/TabNavigationBar$Builder;addTabs([Lnet/minecraft/client/gui/components/tabs/Tab;)Lnet/minecraft/client/gui/components/tabs/TabNavigationBar$Builder;")
+            at = @At(
+                    value = "INVOKE",
+                    //?if <26.2 {
+                    /*target = "Lnet/minecraft/client/gui/components/tabs/TabNavigationBar$Builder;addTabs([Lnet/minecraft/client/gui/components/tabs/Tab;)Lnet/minecraft/client/gui/components/tabs/TabNavigationBar$Builder;"
+                    *///?} else
+                    target = "Lnet/minecraft/client/gui/components/tabs/MenuTabBar$Builder;addTabs([Lnet/minecraft/client/gui/components/tabs/Tab;)Lnet/minecraft/client/gui/components/tabs/MenuTabBar$Builder;"
+            )
     )
-    public Tab[] addTab(Tab[] tabs) {
+    public Tab[] /*? <26.2 { */ /*addTab *//*?} else {*/ addTabs /*?}*/ (Tab[] tabs) {
         if (!Config.Companion.getInstance().getWorldsEnabled()) {
             return tabs;
         }

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

@@ -11,7 +11,7 @@
 @Mixin(TabManager.class)
 public class TabManagerMixin {
 
-    @Inject(method = "setCurrentTab", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "setCurrentTab*", at = @At("HEAD"), cancellable = true)
     public void onResourcifyWorldTab(Tab tab, boolean playClickSound, CallbackInfo ci) {
         // The tab opens a GUI, so we don't want it to be selected because then the GUI would open again after its closed
         if (tab instanceof DownloadWorldTab) {

src/main/kotlin/dev/dediamondpro/resourcify/Constants.kt

@@ -23,6 +23,6 @@ import org.slf4j.LoggerFactory
 object Constants {
     const val NAME = /*$ mod_name*/ "Resourcify"
     const val ID = /*$ mod_id*/ "resourcify"
-    const val VERSION = /*$ mod_version*/ "1.8.3"
+    const val VERSION = /*$ mod_version*/ "1.8.4"
     val LOGGER: Logger = LoggerFactory.getLogger(NAME)
 }

src/main/kotlin/dev/dediamondpro/resourcify/Resourcify.kt

@@ -19,7 +19,6 @@ package dev.dediamondpro.resourcify
 
 import dev.dediamondpro.resourcify.platform.ThemeReloadListener
 import dev.dediamondpro.resourcify.config.SettingsPage
-import dev.dediamondpro.resourcify.handlers.VulkanHandler
 
 //? if fabric {
 import net.fabricmc.api.ClientModInitializer
@@ -48,11 +47,11 @@ object Resourcify /*? if fabric {*/ : ClientModInitializer /*?}*/ {
     init {
         //? if neoforge {
         /*LOADING_CONTEXT.registerExtensionPoint(IConfigScreenFactory::class.java) {
-            IConfigScreenFactory { _, _ -> VulkanHandler.createOrBlock { SettingsPage() } }
+            IConfigScreenFactory { _, _ -> SettingsPage() }
         }
         *///?} else if forge {
         /*LOADING_CONTEXT.registerExtensionPoint(ConfigScreenFactory::class.java) {
-            ConfigScreenFactory { _, _ -> VulkanHandler.createOrBlock { SettingsPage() } }
+            ConfigScreenFactory { _, _ -> SettingsPage() }
         }
         *///?}
 

src/main/kotlin/dev/dediamondpro/resourcify/config/ModMenuIntegration.kt

@@ -21,7 +21,6 @@ package dev.dediamondpro.resourcify.config
 
 import com.terraformersmc.modmenu.api.ConfigScreenFactory
 import com.terraformersmc.modmenu.api.ModMenuApi
-import dev.dediamondpro.resourcify.handlers.VulkanHandler
 import net.minecraft.client.gui.screens.Screen
 
 class ModMenuIntegration : ModMenuApi {
@@ -30,7 +29,7 @@ class ModMenuIntegration : ModMenuApi {
     }
 
     object SettingsFactory : ConfigScreenFactory<Screen?> {
-        override fun create(parent: Screen?): Screen? = VulkanHandler.createOrBlock { SettingsPage() }
+        override fun create(parent: Screen?): Screen = SettingsPage()
     }
 }
 

src/main/kotlin/dev/dediamondpro/resourcify/gui/injections/PackScreensAddition.kt

@@ -22,7 +22,6 @@ import dev.dediamondpro.resourcify.gui.browsepage.BrowseScreen
 import dev.dediamondpro.resourcify.gui.update.UpdateGui
 import dev.dediamondpro.resourcify.services.ProjectType
 import dev.dediamondpro.resourcify.gui.data.Icons
-import dev.dediamondpro.resourcify.handlers.VulkanHandler
 import gg.essential.universal.UScreen
 import net.minecraft.client.gui.screens.Screen
 
@@ -34,10 +33,10 @@ object PackScreensAddition {
         val folder = type.getDirectory(screen)
         val buttons = mutableListOf<ImageButton>()
         buttons.add(ImageButton(screen, type.plusX, type.plusY, Icons.PLUS) {
-            VulkanHandler.runOrBlock { UScreen.displayScreen(BrowseScreen(type, folder)) }
+            UScreen.displayScreen(BrowseScreen(type, folder))
         })
         if (type.hasUpdateButton(folder)) buttons.add(ImageButton(screen, type.updateX, type.updateY, Icons.UPDATE) {
-            VulkanHandler.runOrBlock { UScreen.displayScreen(UpdateGui(type, folder)) }
+            UScreen.displayScreen(UpdateGui(type, folder))
         })
         return buttons
     }