Port to 1.20.2

nanite · Jan 4, 2024 · db92398 · db92398
1 parent c5b994f
commit db92398
Show file tree

Hide file tree

Showing 17 changed files with 196 additions and 93 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,4 @@ run
 .idea/
 
 Fabric/run_client/
+Neoforge/runs
diff --git a/Common/build.gradle b/Common/build.gradle
@@ -4,16 +4,24 @@ plugins {
     id 'maven-publish'
 }
 
-archivesBaseName = "${project.property("mod_name")}-${project.name}"
-
-apply {
-    from file("../gradle/scripts/maven.gradle")
+base {
+    archivesName = "${project.property("mod_name")}-${project.name}"
 }
 
 minecraft {
     version(minecraft_version)
 }
 
+
 dependencies {
     compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5'
-}
+}
+
+publishing {
+    publications {
+        mavenCommon(MavenPublication) {
+            artifactId base.archivesName.get()
+            from components.java
+        }
+    }
+}
diff --git a/Common/src/main/java/com/sunekaer/yeetusexperimentus/mixin/CreateWorldScreenMixin.java b/Common/src/main/java/com/sunekaer/yeetusexperimentus/mixin/CreateWorldScreenMixin.java
@@ -3,6 +3,7 @@
 import net.minecraft.client.gui.screens.worldselection.CreateWorldScreen;
 import net.minecraft.server.packs.repository.PackRepository;
 import net.minecraft.world.level.WorldDataConfiguration;
+import org.spongepowered.asm.mixin.Debug;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -13,6 +14,7 @@
 import java.util.List;
 import java.util.function.Consumer;
 
+@Debug(export = true)
 @Mixin(CreateWorldScreen.class)
 public abstract class CreateWorldScreenMixin {
 

diff --git a/Common/src/main/java/com/sunekaer/yeetusexperimentus/mixin/WorldOpenFlowsMixin.java b/Common/src/main/java/com/sunekaer/yeetusexperimentus/mixin/WorldOpenFlowsMixin.java
@@ -5,12 +5,14 @@
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.worldselection.CreateWorldScreen;
 import net.minecraft.client.gui.screens.worldselection.WorldOpenFlows;
+import org.spongepowered.asm.mixin.Debug;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+@Debug(export = true)
 @Mixin(WorldOpenFlows.class)
 public abstract class WorldOpenFlowsMixin {
 

diff --git a/...ources/assets/yeetusexperimentus/logo.png → ...ain/resources/yeetusexperimentus-logo.png b/...ources/assets/yeetusexperimentus/logo.png → ...ain/resources/yeetusexperimentus-logo.png
diff --git a/Fabric/build.gradle b/Fabric/build.gradle
@@ -1,15 +1,22 @@
 plugins {
-    id 'fabric-loom' version '1.2-SNAPSHOT'
+    id 'fabric-loom' version '1.4-SNAPSHOT'
     id 'maven-publish'
     id 'idea'
 }
 
-archivesBaseName = "${project.property("mod_name")}-${project.name}"
+base {
+    archivesName = "${project.property("mod_name")}-${project.name}"
+}
 
 Project commonProject = parent.project("Common")
 
-apply {
-    from file("../gradle/scripts/maven.gradle")
+repositories {
+    maven {
+        url "https://api.modrinth.com/maven"
+        content {
+            includeGroup "maven.modrinth"
+        }
+    }
 }
 
 dependencies {
@@ -18,6 +25,9 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}"
     modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
     implementation commonProject
+
+    // Modmenu
+    modRuntimeOnly("maven.modrinth:modmenu:${modmenu_version}")
 }
 
 loom {
@@ -50,23 +60,9 @@ tasks.withType(JavaCompile) {
 
 publishing {
     publications {
-        mavenJava(MavenPublication) {
-            groupId project.maven_group
-            artifactId project.archivesBaseName
-            version project.mod_version
-            artifact jar
+        mavenFabric(MavenPublication) {
+            artifactId project.base.archivesName.get()
+            from components.java
         }
     }
-
-    repositories {
-        if (ENV.NANITE_TOKEN) {
-            maven {
-                url "https://maven.nanite.dev/releases"
-                credentials {
-                    username = "nanite"
-                    password = "${ENV.NANITE_TOKEN}"
-                }
-            }
-        }
-    }
-}
+}
diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json
@@ -15,8 +15,7 @@
   },
 
   "license": "All Rights Reserved unless stated otherwise. Distribution permission is given to FeedTheBeast and CurseForge for use in modpacks",
-  "icon": "assets/yeetusexperimentus/icon.png",
-
+  "icon": "yeetusexperimentus-logo.png",
   "environment": "*",
   "entrypoints": {},
   "mixins": [
@@ -29,4 +28,3 @@
     "java": ">=17"
   }
 }
-
diff --git a/Forge/build.gradle b/Forge/build.gradle
@@ -3,15 +3,15 @@ plugins {
     id 'eclipse'
     id 'maven-publish'
     id 'net.minecraftforge.gradle' version '6.0.+'
-    id 'net.darkhax.curseforgegradle' version '1.0.14'
     id 'org.spongepowered.mixin' version '0.7-SNAPSHOT'
 }
 
-archivesBaseName = "${project.property("mod_name")}-${project.name}"
+base {
+    archivesName = "${project.property("mod_name")}-${project.name}"
+}
 
 Project commonProject = parent.project("Common")
 
-
 mixin {
     add commonProject.sourceSets.main, "${mod_id}.refmap.json"
     config("${mod_id}.mixins.json")
@@ -69,23 +69,9 @@ jar.finalizedBy('reobfJar')
 
 publishing {
     publications {
-        mavenJava(MavenPublication) {
-            groupId project.maven_group
-            artifactId project.archivesBaseName
-            version project.mod_version
+        register("mavenForge", MavenPublication) {
+            artifactId base.archivesName.get()
             artifact jar
         }
     }
-
-    repositories {
-        if (ENV.NANITE_TOKEN) {
-            maven {
-                url "https://maven.nanite.dev/releases"
-                credentials {
-                    username = "nanite"
-                    password = "${ENV.NANITE_TOKEN}"
-                }
-            }
-        }
-    }
-}
+}
diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml
@@ -5,7 +5,7 @@ license="All Rights Reserved"
 modId="yeetusexperimentus"
 version="${file.jarVersion}"
 displayName="Yeetus Experimentus"
-logoFile="assets/yeetusexperimentus/logo.png"
+logoFile="yeetusexperimentus-logo.png"
 authors="Sunekaer"
 description='''
 Disables the Experimental Settings popup, which appears when you create or load world.
@@ -21,4 +21,4 @@ modId="minecraft"
 mandatory=true
 versionRange="[1.20,)"
 ordering="NONE"
-side="BOTH"
+side="BOTH"
diff --git a/Neoforge/build.gradle b/Neoforge/build.gradle
@@ -0,0 +1,65 @@
+plugins {
+    id 'idea'
+    id 'maven-publish'
+    id 'net.neoforged.gradle.userdev' version '7.0.+'
+    id 'net.neoforged.gradle.mixin' version '7.0+'
+    id 'java-library'
+}
+
+base {
+    archivesName = "${project.property("mod_name")}-${project.name}"
+}
+
+Project commonProject = parent.project("Common")
+
+mixin {
+    config("${mod_id}.mixins.json")
+}
+
+runs {
+    configureEach {
+        modSource project.sourceSets.main
+    }
+
+    client {
+        systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+    }
+
+    server {
+        systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+        programArgument '--nogui'
+    }
+}
+
+dependencies {
+    implementation "net.neoforged:neoforge:${neoforge_version}"
+    compileOnly commonProject
+}
+
+publishing {
+    publications {
+        register("mavenNeoforge", MavenPublication) {
+            artifactId base.archivesName.get()
+            artifact jar
+        }
+    }
+}
+
+// Thanks jared
+Spec<Task> notNeoTask = { Task it -> !it.name.startsWith("neo") } as Spec<Task>
+
+tasks.withType(JavaCompile).matching(notNeoTask).configureEach {
+    source(project(":Common").sourceSets.main.allSource)
+}
+
+tasks.withType(Javadoc).matching(notNeoTask).configureEach {
+    source(project(":Common").sourceSets.main.allJava)
+}
+
+tasks.named("sourcesJar", Jar) {
+    from(project(":Common").sourceSets.main.allSource)
+}
+
+tasks.withType(ProcessResources).matching(notNeoTask).configureEach {
+    from project(":Common").sourceSets.main.resources
+}
diff --git a/Neoforge/src/main/java/com/sunekaer/yeetusexperimentus/YeetusExperimentusNeoForge.java b/Neoforge/src/main/java/com/sunekaer/yeetusexperimentus/YeetusExperimentusNeoForge.java
@@ -0,0 +1,10 @@
+package com.sunekaer.yeetusexperimentus;
+
+import net.neoforged.fml.common.Mod;
+
+@Mod(YeetusExperimentus.MOD_ID)
+public class YeetusExperimentusNeoForge {
+
+    public YeetusExperimentusNeoForge() {
+    }
+}
diff --git a/Neoforge/src/main/resources/META-INF/mods.toml b/Neoforge/src/main/resources/META-INF/mods.toml
@@ -0,0 +1,24 @@
+modLoader="javafml"
+loaderVersion="[1,)"
+license="All Rights Reserved"
+[[mods]]
+modId="yeetusexperimentus"
+version="${file.jarVersion}"
+displayName="Yeetus Experimentus"
+logoFile="yeetusexperimentus-logo.png"
+authors="Sunekaer"
+description='''
+Disables the Experimental Settings popup, which appears when you create or load world.
+'''
+[[dependencies.yeetusexperimentus]]
+modId="neoforge"
+mandatory=true
+versionRange="[20.2,)"
+ordering="NONE"
+side="BOTH"
+[[dependencies.yeetusexperimentus]]
+modId="minecraft"
+mandatory=true
+versionRange="[1.20,)"
+ordering="NONE"
+side="BOTH"