Fix some stuffs, create common with mixin

Xyndra · Xyndra · commit 5f6fe3e503e8 · 2025-07-02T14:19:45.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,4 +25,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: Artifacts
-          path: '**/build/libs/'
+          if-no-files-found: 'error'
+          path: |
+            fabric/build/libs/*.jar
+            neo/build/libs/*.jar
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     kotlin("jvm") version "2.1.21" apply false
+    id("net.neoforged.gradle.common") version "7.0.189"
 }
 
 subprojects {
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -2,12 +2,56 @@ plugins {
     id("java-library")
     id("maven-publish")
     kotlin("jvm")
+    id("net.neoforged.gradle.vanilla") version "7.0.189"
+}
+
+val parchmentVersion: String by project
+
+subsystems {
+    parchment {
+        addRepository(false)
+        parchmentArtifact("org.parchmentmc.data:parchment-${project.property("minecraftVersion") as String}:$parchmentVersion")
+    }
+}
+
+repositories {
+    exclusiveContent {
+        forRepository {
+            maven {
+                name = "Sponge"
+                url = uri("https://repo.spongepowered.org/repository/maven-public/")
+            }
+        }
+        filter { includeGroupAndSubgroups("org.spongepowered") }
+    }
+    exclusiveContent {
+        forRepositories(
+            maven {
+                name = "ParchmentMC"
+                url = uri("https://maven.parchmentmc.org")
+            },
+            maven {
+                name = "NeoForged Maven"
+                url = uri("https://maven.neoforged.net/releases")
+            }
+        )
+        filter { includeGroup("org.parchmentmc.data") }
+    }
 }
 
 val modId: String by project
 val modVersion: String by project
 val minecraftVersion: String by project
+val neoVersion: String by project
 
 base {
     archivesName = "$modId-$minecraftVersion-common-$modVersion"
 }
+
+dependencies {
+    compileOnly("org.spongepowered:mixin:0.8.5")
+    compileOnly("io.github.llamalad7:mixinextras-common:0.3.5")
+    compileOnly("net.minecraft:client:$minecraftVersion")
+    annotationProcessor("io.github.llamalad7:mixinextras-common:0.3.5")
+
+}
diff --git a/common/src/main/java/com/example/mixin/ExampleMixin.java b/common/src/main/java/com/example/mixin/ExampleMixin.java
@@ -1,15 +1,16 @@
 package com.example.mixin;
 
-import net.minecraft.server.MinecraftServer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import net.minecraft.server.MinecraftServer;
 
 @Mixin(MinecraftServer.class)
 public class ExampleMixin {
 	@Inject(at = @At("HEAD"), method = "loadLevel")
 	private void init(CallbackInfo info) {
 		// This code is injected into the start of MinecraftServer.loadLevel()V
+		System.out.println("Hello from ExampleMixin! The server is starting up.");
 	}
 }
diff --git a/common/src/main/resources/assets/examplemod/icon.png b/common/src/main/resources/assets/examplemod/icon.png
diff --git a/common/src/main/resources/assets/examplemod/lang/en_us.json b/common/src/main/resources/assets/examplemod/lang/en_us.json
diff --git a/common/src/main/resources/examplemod.mixins.json b/common/src/main/resources/examplemod.mixins.json
@@ -3,7 +3,7 @@
 	"package": "com.example.mixin",
 	"compatibilityLevel": "JAVA_21",
 	"mixins": [
-		"ExampleMixin"
+      "ExampleMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
 	id("fabric-loom")
 	id("maven-publish")
@@ -67,6 +69,7 @@ val replacements = mapOf(
 )
 
 tasks.named<ProcessResources>("processResources") {
+	from(project(":common").sourceSets.main.get().resources)
 	filesNotMatching(mutableSetOf("**/*.png")) {
 		expand(replacements)
 	}
@@ -76,10 +79,11 @@ tasks.withType<JavaCompile>().configureEach {
 	options.release.set(21)
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+tasks.withType<KotlinCompile>().configureEach {
 	compilerOptions {
 		jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
 	}
+	source(project(":common").sourceSets.main.get().allSource)
 }
 
 
diff --git a/fabric/src/main/kotlin/com/example/ExampleMod.kt b/fabric/src/main/kotlin/com/example/ExampleMod.kt
@@ -4,7 +4,7 @@ import net.fabricmc.api.ModInitializer
 import org.slf4j.LoggerFactory
 
 object ExampleMod : ModInitializer {
-    private val logger = LoggerFactory.getLogger("examplemod")
+    private val logger = LoggerFactory.getLogger("assets/examplemod")
 
 	override fun onInitialize() {
 		// This code runs as soon as Minecraft is in a mod-load-ready state.
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -29,7 +29,7 @@
 		]
 	},
 	"mixins": [
-		"examplemod.mixins.json"
+		"${mod_id}.mixins.json"
 	],
 	"depends": {
 		"fabricloader": ">=0.16.14",
diff --git a/neo/build.gradle.kts b/neo/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     id("java-library")
     id("maven-publish")
@@ -56,7 +58,7 @@ java {
     }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+tasks.withType<KotlinCompile>().configureEach {
     compilerOptions {
         jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
     }
@@ -71,7 +73,7 @@ val outerMinecraftVersion = minecraftVersion
 subsystems {
     parchment {
         addRepository(false)
-        parchmentArtifact("org.parchmentmc.data:parchment-${outerMinecraftVersion}:${parchmentVersion}")
+        parchmentArtifact("org.parchmentmc.data:parchment-$outerMinecraftVersion:$parchmentVersion")
     }
 }
 
@@ -165,18 +167,28 @@ dependencies {
     // Example mod dependency using a file as dependency
     // implementation files("libs/coolmod-${mc_version}-${coolmod_version}.jar")
 
+    implementation(project(":common"))
     implementation("thedarkcolour:kotlinforforge-neoforge:$kotlinForForgeVersion")
 
     // For more info:
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
 }
 
+tasks.withType<KotlinCompile>().configureEach {
+    source(project(":common").sourceSets.main.get().allSource)
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    source(project(":common").sourceSets.main.get().allSource)
+}
+
 // This block of code expands all declared replace properties in the specified resource targets.
 // A missing property will result in an error. Properties are expanded using ${} Groovy notation.
 // When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments.
 // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
 tasks.withType<ProcessResources>().configureEach {
+    from(project(":common").sourceSets.main.get().resources)
     val replaceProperties = mapOf(
         "minecraft_version" to minecraftVersion,
         "minecraft_version_range" to minecraftVersionRange,
@@ -190,7 +202,9 @@ tasks.withType<ProcessResources>().configureEach {
         "mod_description" to modDescription,
     )
     inputs.properties(replaceProperties)
-    expand(replaceProperties)
+    filesNotMatching("**/*.png") {
+        expand(replaceProperties)
+    }
 }
 
 // Example configuration to allow publishing using the maven-publish plugin
diff --git a/neo/src/main/java/com/example/Config.kt b/neo/src/main/java/com/example/Config.kt
@@ -0,0 +1,42 @@
+package com.example
+
+import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.resources.ResourceLocation
+import net.neoforged.neoforge.common.ModConfigSpec
+
+// An example config class. This is not required, but it's a good idea to have one to keep your config organized.
+// Demonstrates how to use Neo's config APIs
+object Config {
+    private val BUILDER = ModConfigSpec.Builder()
+
+    @JvmField
+    val LOG_DIRT_BLOCK: ModConfigSpec.BooleanValue = BUILDER
+        .comment("Whether to log the dirt block on common setup")
+        .define("logDirtBlock", true)
+
+    @JvmField
+    val MAGIC_NUMBER: ModConfigSpec.IntValue = BUILDER
+        .comment("A magic number")
+        .defineInRange("magicNumber", 42, 0, Int.MAX_VALUE)
+
+    @JvmField
+    val MAGIC_NUMBER_INTRODUCTION: ModConfigSpec.ConfigValue<String> = BUILDER
+        .comment("What you want the introduction message to be for the magic number")
+        .define("magicNumberIntroduction", "The magic number is... ")
+
+    // a list of strings that are treated as resource locations for items
+    @JvmField
+    val ITEM_STRINGS: ModConfigSpec.ConfigValue<List<String>> = BUILDER
+        .comment("A list of items to log on common setup.")
+        .defineListAllowEmpty(
+            "items", listOf("minecraft:iron_ingot"),
+            { "" },
+            { obj: Any -> validateItemName(obj) })
+
+    @JvmField
+    val SPEC: ModConfigSpec = BUILDER.build()
+
+    private fun validateItemName(obj: Any): Boolean {
+        return obj is String && BuiltInRegistries.ITEM.containsKey(ResourceLocation.parse(obj))
+    }
+}
diff --git a/neo/src/main/java/com/example/ExampleMod.java b/neo/src/main/java/com/example/ExampleMod.java
@@ -1,4 +1,4 @@
-package com.example.examplemod;
+package com.example;
 
 import org.slf4j.Logger;
 
diff --git a/neo/src/main/java/com/example/ExampleModClient.java b/neo/src/main/java/com/example/ExampleModClient.java
@@ -1,4 +1,4 @@
-package com.example.examplemod;
+package com.example;
 
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.fml.ModContainer;
diff --git a/neo/src/main/java/com/example/examplemod/Config.java b/neo/src/main/java/com/example/examplemod/Config.java
diff --git a/neo/src/main/resources/META-INF/neoforge.mods.toml b/neo/src/main/resources/META-INF/neoforge.mods.toml
@@ -30,7 +30,7 @@ displayName="${mod_name}" #mandatory
 #displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional
 
 # A file name (in the root of the mod JAR) containing a logo for display
-#logoFile="examplemod.png" #optional
+logoFile="assets/examplemod/icon.png" #optional
 
 # A text field displayed in the mod UI
 #credits="" #optional
@@ -42,8 +42,8 @@ authors="${mod_authors}" #optional
 description='''${mod_description}'''
 
 # The [[mixins]] block allows you to declare your mixin config to FML so that it gets loaded.
-#[[mixins]]
-#config="${mod_id}.mixins.json"
+[[mixins]]
+config="${mod_id}.mixins.json"
 
 # The [[accessTransformers]] block allows you to declare where your AT file is.
 # If this block is omitted, a fallback attempt will be made to load an AT from META-INF/accesstransformer.cfg
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -22,4 +22,9 @@ pluginManagement {
 
 val modName: String by settings
 rootProject.name = modName
+// Set the names of the subprojects to be like "Example Mod - Fabric"
+val modId: String by settings
+rootProject.children.forEach { subproject ->
+	subproject.name = "$modName - ${subproject.name.replaceFirstChar { it.uppercase() }}"
+}
 include(":fabric", ":neo", ":common")

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`kotlin("jvm") version "2.1.21" apply false`
	`3`	`+ id("net.neoforged.gradle.common") version "7.0.189"`
`3`	`4`	`}`
`4`	`5`
`5`	`6`	`subprojects {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
	`2`	`+`
`1`	`3`	`plugins {`
`2`	`4`	`id("fabric-loom")`
`3`	`5`	`id("maven-publish")`
`@@ -67,6 +69,7 @@ val replacements = mapOf(`
`67`	`69`	`)`
`68`	`70`
`69`	`71`	`tasks.named<ProcessResources>("processResources") {`
	`72`	`+ from(project(":common").sourceSets.main.get().resources)`
`70`	`73`	`filesNotMatching(mutableSetOf("*/.png")) {`
`71`	`74`	`expand(replacements)`
`72`	`75`	`}`
`@@ -76,10 +79,11 @@ tasks.withType<JavaCompile>().configureEach {`
`76`	`79`	`options.release.set(21)`
`77`	`80`	`}`
`78`	`81`
`79`		`-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {`
	`82`	`+tasks.withType<KotlinCompile>().configureEach {`
`80`	`83`	`compilerOptions {`
`81`	`84`	`jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)`
`82`	`85`	`}`
	`86`	`+ source(project(":common").sourceSets.main.get().allSource)`
`83`	`87`	`}`
`84`	`88`
`85`	`89`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`]`
`30`	`30`	`},`
`31`	`31`	`"mixins": [`
`32`		`- "examplemod.mixins.json"`
	`32`	`+ "${mod_id}.mixins.json"`
`33`	`33`	`],`
`34`	`34`	`"depends": {`
`35`	`35`	`"fabricloader": ">=0.16.14",`