feat: ported to 1.20.6

.github/workflows/release.yml

@@ -11,10 +11,10 @@ jobs:
       !contains(github.event.head_commit.message, '[ciskip]')
     uses: nanite/workflows/.github/workflows/[email protected]
     with:
-      java-version: 17
+      java-version: 21
       changelog-file: "./CHANGELOG.md"
       release-to-github: false
     secrets:
       nanite-token: ${{ secrets.NANITE_DEPLOY }}
       curse-token: ${{ secrets.CURSE_DEPLOY }}
-      modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+      modrinth-token: ${{ secrets.MODRINTH_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,5 @@
-## [84.0.2]
+## [86.0.0]
 
-### Fixed
+### Changed
 
-- Simplified mixins which should fix the mod not working on NeoForge and Forge 
+- Updated to 1.20.6 

build.gradle

@@ -50,7 +50,7 @@ allprojects {
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 17
+        options.release = 21
     }
 
     java {
@@ -70,11 +70,11 @@ publishMods {
         modLoaders.add("fabric")
     }
 
-    def forgeOptions = publishOptions {
-        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
-        displayName = "[FORGE][${minecraft_version}] ${project.name} ${mod_version}"
-        modLoaders.add("forge")
-    }
+//    def forgeOptions = publishOptions {
+//        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
+//        displayName = "[FORGE][${minecraft_version}] ${project.name} ${mod_version}"
+//        modLoaders.add("forge")
+//    }
 
     def neoForge = publishOptions {
         file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
@@ -86,7 +86,7 @@ publishMods {
         accessToken = providers.environmentVariable("CURSE_TOKEN")
         projectId = "${curseforge_id}"
         minecraftVersions.add("${minecraft_version}")
-        javaVersions.add(JavaVersion.VERSION_17)
+        javaVersions.add(JavaVersion.VERSION_21)
         clientRequired = true
         serverRequired = false
     }
@@ -104,9 +104,9 @@ publishMods {
         }
     }
 
-    curseforge("curseforgeForge") {
-        from(curseForgeOptions, forgeOptions)
-    }
+//    curseforge("curseforgeForge") {
+//        from(curseForgeOptions, forgeOptions)
+//    }
 
     curseforge("curseforgeNeoForge") {
         from(curseForgeOptions, neoForge)
@@ -120,9 +120,9 @@ publishMods {
             }
         }
 
-        modrinth("modrinthForge") {
-            from(modrinthOptions, forgeOptions)
-        }
+//        modrinth("modrinthForge") {
+//            from(modrinthOptions, forgeOptions)
+//        }
 
         modrinth("modrinthNeoforge") {
             from(modrinthOptions, neoForge)

common/src/main/java/com/sunekaer/yeetusexperimentus/mixin/WorldOpenFlowsMixin.java

@@ -7,6 +7,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
+@Debug(export = true)
 @Mixin(WorldOpenFlows.class)
 public class WorldOpenFlowsMixin {
     @ModifyVariable(method = "confirmWorldCreation", at = @At("HEAD"), argsOnly = true)
@@ -15,9 +16,9 @@ private static Lifecycle alwaysStable(Lifecycle cycle) {
     }
 
     @ModifyVariable(
-            method = "loadLevel(Lnet/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess;Lcom/mojang/serialization/Dynamic;ZZLjava/lang/Runnable;)V",
+            method = "openWorldCheckWorldStemCompatibility",
             at = @At("STORE"),
-            ordinal = 3
+            ordinal = 1
     )
     public boolean no(boolean a) {
         return false;

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.daemon=false
 enabled_platforms=fabric,neoforge,forge
 
 # Project
-mod_version=84.0.2
+mod_version=86.0.0
 maven_group=com.sunekaer.mods
 mod_name=YeetusExperimentus
 mod_author=Sunekaer
@@ -16,19 +16,19 @@ curseforge_id=635427
 modrinth_id=HaaH232J
 
 # Common
-minecraft_version=1.20.4
+minecraft_version=1.20.6
 
 # Forge
-forge_version=49.0.14
-forge_gradle_version=6.0.18
+#forge_version=49.0.14
+#forge_gradle_version=6.0.18
 
 # Neo
-neoforge_version=20.4.80-beta
-neoforge_gradle_version=7.0.80
+neoforge_version=20.6.115
+neoforge_gradle_version=7.0.142
 
 # Fabric
-fabric_api_version=0.91.2+1.20.4
-fabric_loader_version=0.15.3
+fabric_api_version=0.100.0+1.20.6
+fabric_loader_version=0.15.11
 
 
-modmenu_version=8.0.1
+modmenu_version=10.0.0-beta.1

neoforge/build.gradle

@@ -38,7 +38,7 @@ processResources {
     duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
     inputs.property "version", project.version
 
-    filesMatching("META-INF/mods.toml") {
+    filesMatching("META-INF/neoforge.mods.toml") {
         expand "version": project.version
     }
 }
@@ -81,4 +81,4 @@ publishing {
             from components.java
         }
     }
-}
+}

neoforge/src/main/resources/META-INF/mods.toml → neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[1,)"
+loaderVersion="[2,)"
 license="All Rights Reserved"
 
 [[mods]]
@@ -15,19 +15,19 @@ Disables the Experimental Settings popup, which appears when you create or load
 [[dependencies.yeetusexperimentus]]
 modId="neoforge"
 required=true
-versionRange="[20.2,)"
+versionRange="[20.6,)"
 ordering="NONE"
 side="BOTH"
 
 [[dependencies.yeetusexperimentus]]
 modId="minecraft"
 required=true
-versionRange="[1.20,)"
+versionRange="[1.20.6,)"
 ordering="NONE"
 side="BOTH"
 
 [[mixins]]
 config = "yeetusexperimentus-common.mixins.json"
 
 [[mixins]]
-config = "yeetusexperimentus-neo.mixins.json"
+config = "yeetusexperimentus-neo.mixins.json"

settings.gradle

@@ -10,4 +10,5 @@ pluginManagement {
 }
 
 rootProject.name = 'YeetusExperimentus'
-include("common", "fabric", "forge", "neoforge")
+//include("common", "fabric", "forge", "neoforge")
+include("common", "fabric", "neoforge")