Update to 1.20.4

- Use NeoForge instead of forge

build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.3-SNAPSHOT" apply false
-    id 'io.github.juuxel.loom-vineflower' version '1.11.0' apply false
+    id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
 }
 
 architectury {
@@ -10,7 +9,6 @@ architectury {
 
 subprojects {
     apply plugin: "dev.architectury.loom"
-    apply plugin: "io.github.juuxel.loom-vineflower"
 
     loom {
         silentMojangMappingsLicense()

common/src/main/java/com/minenash/seamless_loading_screen/config/SeamlessLoadingScreenConfig.java

@@ -25,8 +25,6 @@ public class SeamlessLoadingScreenConfig {
                     .appendGsonBuilder(builder -> builder.setPrettyPrinting()
                             .disableHtmlEscaping()
                             .serializeNulls()
-                            .registerTypeHierarchyAdapter(Text.class, new Text.Serializer())
-                            .registerTypeHierarchyAdapter(Style.class, new Style.Serializer())
                             .registerTypeHierarchyAdapter(Color.class, colorAdapter))
                     .setPath(PlatformFunctions.getConfigDirectory().resolve("seamless_loading_screen.json"))
                     .build()

common/src/main/java/com/minenash/seamless_loading_screen/mixin/ConnectScreenMixin.java

@@ -3,7 +3,7 @@
 import com.minenash.seamless_loading_screen.ScreenshotLoader;
 import com.minenash.seamless_loading_screen.ServerInfoExtension;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.ConnectScreen;
+import net.minecraft.client.gui.screen.multiplayer.ConnectScreen;
 import net.minecraft.client.network.ServerAddress;
 import net.minecraft.client.network.ServerInfo;
 import org.spongepowered.asm.mixin.Mixin;

common/src/main/java/com/minenash/seamless_loading_screen/mixin/LevelLoadingScreenMixin.java

@@ -1,6 +1,6 @@
 package com.minenash.seamless_loading_screen.mixin;
 
-import net.minecraft.client.gui.screen.LevelLoadingScreen;
+import net.minecraft.client.gui.screen.world.LevelLoadingScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;

common/src/main/java/com/minenash/seamless_loading_screen/mixin/custom_screenshots/AddServerScreenMixin.java

@@ -1,7 +1,7 @@
 package com.minenash.seamless_loading_screen.mixin.custom_screenshots;
 
 import com.minenash.seamless_loading_screen.ServerInfoExtension;
-import net.minecraft.client.gui.screen.AddServerScreen;
+import net.minecraft.client.gui.screen.multiplayer.AddServerScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.network.ServerInfo;

fabric/build.gradle

@@ -63,8 +63,8 @@ dependencies {
 
     modCompileOnly("maven.modrinth:bedrockify:${rootProject.bedrockify_version}")
 
-    modImplementation "dev.isxander.yacl:yet-another-config-lib-fabric:${rootProject.yacl_version}"
-    include "dev.isxander.yacl:yet-another-config-lib-fabric:${rootProject.yacl_version}"
+    modImplementation ("dev.isxander.yacl:yet-another-config-lib-fabric:${rootProject.yacl_version}")
+    //include "dev.isxander.yacl:yet-another-config-lib-fabric:${rootProject.yacl_version}"
 
     //modLocalRuntime ("maven.modrinth:fastload:3.4.0")
 

fabric/src/main/resources/fabric.mod.json

@@ -34,7 +34,8 @@
   "depends": {
     "fabricloader": "*",
     "fabric": "*",
-    "minecraft": ">=1.20.2"
+    "minecraft": ">=1.20.2",
+    "yet_another_config_lib_v3": "*"
   },
   "conflicts": {
     "wynntils": "*"

forge/build.gradle

@@ -35,7 +35,7 @@ dependencies {
     //modCompileOnly ("maven.modrinth:rubidium:0.7.0a")
 
     modImplementation "dev.isxander.yacl:yet-another-config-lib-forge:${rootProject.yacl_version}"
-    include "dev.isxander.yacl:yet-another-config-lib-forge:${rootProject.yacl_version}"
+    //include "dev.isxander.yacl:yet-another-config-lib-forge:${rootProject.yacl_version}"
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }

forge/src/main/java/com/minenash/seamless_loading_screen/forge/PlatformFunctionsImpl.java

@@ -1,4 +1,4 @@
-package com.minenash.seamless_loading_screen.forge;
+package com.minenash.seamless_loading_screen.neoforge;
 
 import com.minenash.seamless_loading_screen.PlatformFunctions;
 import net.minecraftforge.fml.loading.FMLLoader;

forge/src/main/java/com/minenash/seamless_loading_screen/forge/SeamlessLoadingScreenClientEvents.java

@@ -1,4 +1,4 @@
-package com.minenash.seamless_loading_screen.forge;
+package com.minenash.seamless_loading_screen.neoforge;
 
 import com.minenash.seamless_loading_screen.SeamlessLoadingScreen;
 import com.minenash.seamless_loading_screen.config.SeamlessLoadingScreenConfig;

forge/src/main/java/com/minenash/seamless_loading_screen/forge/SeamlessLoadingScreenForge.java

@@ -1,4 +1,4 @@
-package com.minenash.seamless_loading_screen.forge;
+package com.minenash.seamless_loading_screen.neoforge;
 
 import com.minenash.seamless_loading_screen.SeamlessLoadingScreen;
 import net.minecraftforge.api.distmarker.Dist;

forge/src/main/java/com/minenash/seamless_loading_screen/forge/SeamlessLoadingScreenShaderInit.java

@@ -1,4 +1,4 @@
-package com.minenash.seamless_loading_screen.forge;
+package com.minenash.seamless_loading_screen.neoforge;
 
 import com.minenash.seamless_loading_screen.SeamlessLoadingScreen;
 import com.mojang.logging.LogUtils;

forge/src/main/resources/seamless_loading_screen-forge.mixins.json

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "com.minenash.seamless_loading_screen.forge.mixin",
+  "package": "com.minenash.seamless_loading_screen.neoforge.mixin",
   "compatibilityLevel": "JAVA_17",
   "minVersion": "0.8",
   "client": [

gradle.properties

@@ -1,19 +1,25 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx4G
 # Mod Properties
-mod_version=2.1.1+1.20.2
+mod_version=2.1.1+1.20.4
 maven_group=com.minenash
 archives_base_name=seamless-loading-screen
 # Common Properties
-minecraft_version=1.20.2
-enabled_platforms=fabric,forge
-yarn_mappings=1.20.2+build.4
-yacl_version=3.2.1+1.20.2
+minecraft_version=1.20.4
+enabled_platforms=fabric,neoforge
+yarn_mappings=1.20.4+build.3
+yacl_version=3.3.1+1.20.4
+
 # Fabric
-fabric_loader_version=0.14.23
-fabric_api_version=0.90.0+1.20.2
-modmenu_version=8.0.0
+fabric_loader_version=0.15.3
+fabric_api_version=0.92.0+1.20.4
+
+modmenu_version=9.0.0
 bedrockify_version=1.9.1+mc1.20.2
+
+# NeoForge
+neoforge_version=20.4.46-beta
+
 # Forge
-forge_version=1.20.2-48.0.13
+forge_version=1.20.4-49.0.12
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

neoforge/build.gradle

@@ -0,0 +1,102 @@
+plugins {
+    id "com.github.johnrengelman.shadow" version "7.1.2"
+}
+
+repositories {
+    maven { url = 'https://maven.neoforged.net/releases/' }
+}
+
+architectury {
+    platformSetupLoomIde()
+    neoForge()
+}
+
+loom {
+    accessWidenerPath = project(":common").loom.accessWidenerPath
+
+    neoForge {
+//        convertAccessWideners = true
+//        extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
+//
+//        mixinConfig "seamless_loading_screen-common.mixins.json"
+//        mixinConfig "seamless_loading_screen-neoForge.mixins.json"
+    }
+}
+
+configurations {
+    common
+    shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentNeoForge.extendsFrom common
+}
+
+dependencies {
+    neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}"
+
+    //modLocalRuntime ("maven.modrinth:fastload:mc1.20.1-3.4.0")
+    //modLocalRuntime ("maven.modrinth:rubidium:0.7.0a")
+    //modCompileOnly ("maven.modrinth:rubidium:0.7.0a")
+
+    modImplementation("dev.isxander.yacl:yet-another-config-lib-neoforge:${rootProject.yacl_version}"){
+        transitive = false
+    }
+    //include "dev.isxander.yacl:yet-another-config-lib-neoforge:${rootProject.yacl_version}"
+
+    common(project(path: ":common", configuration: "namedElements")) { transitive false }
+    shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false }
+}
+
+processResources {
+    inputs.property "version", project.version
+
+    filesMatching("META-INF/mods.toml") {
+        expand "version": project.version
+    }
+}
+
+shadowJar {
+    exclude "fabric.mod.json"
+    exclude "architectury.common.json"
+
+    configurations = [project.configurations.shadowCommon]
+    archiveClassifier.set "dev-shadow"
+}
+
+remapJar {
+    input.set shadowJar.archiveFile
+    dependsOn shadowJar
+    archiveClassifier.set "neoforge"
+
+    atAccessWideners.add(loom.accessWidenerPath.get().asFile.name)//atAccessWideners.add('my_mod.accesswidener')
+}
+
+jar {
+    archiveClassifier.set "dev"
+}
+
+sourcesJar {
+    def commonSources = project(":common").sourcesJar
+    dependsOn commonSources
+    from commonSources.archiveFile.map { zipTree(it) }
+}
+
+components.java {
+    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+        skip()
+    }
+}
+
+publishing {
+    publications {
+        mavenForge(MavenPublication) {
+            artifactId = rootProject.archives_base_name + "-" + project.name
+            from components.java
+        }
+    }
+
+    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+    repositories {
+        // Add repositories to publish to here.
+    }
+}

neoforge/gradle.properties

@@ -0,0 +1 @@
+loom.platform=neoforge

neoforge/src/main/java/com/minenash/seamless_loading_screen/neoforge/PlatformFunctionsImpl.java

@@ -0,0 +1,31 @@
+package com.minenash.seamless_loading_screen.neoforge;
+
+import com.minenash.seamless_loading_screen.PlatformFunctions;
+import net.neoforged.fml.loading.FMLLoader;
+import net.neoforged.fml.loading.FMLPaths;
+
+import java.nio.file.Path;
+
+public class PlatformFunctionsImpl {
+
+    /**
+     * This is our actual method to {@link PlatformFunctions#getConfigDirectory()}.
+     */
+    public static Path getConfigDirectory() {
+        return FMLPaths.CONFIGDIR.get();
+    }
+
+    public static boolean isClientEnv() {
+        return FMLLoader.getDist().isClient();
+    }
+
+    //--
+
+    public static Path getGameDir() {
+        return FMLLoader.getGamePath();
+    }
+
+    public static boolean isDevEnv() {
+        return !FMLLoader.isProduction();
+    }
+}

neoforge/src/main/java/com/minenash/seamless_loading_screen/neoforge/SeamlessLoadingScreenClientEvents.java

@@ -0,0 +1,23 @@
+package com.minenash.seamless_loading_screen.neoforge;
+
+import com.minenash.seamless_loading_screen.SeamlessLoadingScreen;
+import com.minenash.seamless_loading_screen.config.SeamlessLoadingScreenConfig;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.ModList;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
+import net.neoforged.neoforge.client.ConfigScreenHandler;
+
+@Mod.EventBusSubscriber(modid = SeamlessLoadingScreen.MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
+public class SeamlessLoadingScreenClientEvents {
+
+    @SubscribeEvent
+    public static void onPostInit(FMLClientSetupEvent event) {
+        ModList.get().getModContainerById(SeamlessLoadingScreen.MODID).ifPresent(modContainer -> {
+            modContainer.registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () ->
+                    new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> SeamlessLoadingScreenConfig.getInstance().generateScreen(parent)));
+        });
+    }
+}
+

neoforge/src/main/java/com/minenash/seamless_loading_screen/neoforge/SeamlessLoadingScreenForge.java

@@ -0,0 +1,26 @@
+package com.minenash.seamless_loading_screen.neoforge;
+
+import com.minenash.seamless_loading_screen.SeamlessLoadingScreen;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.IExtensionPoint;
+import net.neoforged.fml.ModLoadingContext;
+import net.neoforged.fml.common.Mod;
+
+
+@Mod(SeamlessLoadingScreen.MODID)
+public class SeamlessLoadingScreenForge {
+
+    public SeamlessLoadingScreenForge(IEventBus modEventBus, Dist dist) {
+        //Is this needed?
+        ModLoadingContext.get()
+                .registerExtensionPoint(
+                        IExtensionPoint.DisplayTest.class,
+                        () -> new IExtensionPoint.DisplayTest(() -> IExtensionPoint.DisplayTest.IGNORESERVERONLY, (remote, server) -> true)
+                );
+
+        if(dist.isClient()){
+            SeamlessLoadingScreen.onInitializeClient();
+        }
+    }
+}

neoforge/src/main/java/com/minenash/seamless_loading_screen/neoforge/SeamlessLoadingScreenShaderInit.java

@@ -0,0 +1,35 @@
+package com.minenash.seamless_loading_screen.neoforge;
+
+import com.minenash.seamless_loading_screen.SeamlessLoadingScreen;
+import com.mojang.logging.LogUtils;
+import net.minecraft.client.gl.ShaderProgram;
+import net.minecraft.client.render.VertexFormats;
+import net.minecraft.util.Identifier;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.neoforge.client.event.RegisterShadersEvent;
+import org.slf4j.Logger;
+
+import java.io.IOException;
+
+@Mod.EventBusSubscriber(modid = SeamlessLoadingScreen.MODID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD)
+public class SeamlessLoadingScreenShaderInit {
+
+    public static Logger LOGGER = LogUtils.getLogger();
+
+//    public static void init(IEventBus bus){
+//        bus.addListener(SeamlessLoadingScreenShaderInit::registerShaders);
+//    }
+
+    @SubscribeEvent
+    public static void registerShaders(RegisterShadersEvent event) {
+        try {
+            event.registerShader(new ShaderProgram(event.getResourceProvider(), new Identifier(SeamlessLoadingScreen.MODID, "blur"), VertexFormats.POSITION), (shaderProgram) -> {
+                SeamlessLoadingScreen.BLUR_PROGRAM.load(shaderProgram);
+            });
+        } catch (IOException e) {
+            LOGGER.error("[SeamlessLoadingScreenShaderInit] An issue with loading the needed shader files has failed, blur will not be working!", e);
+        }
+    }
+}