Merge pull request #18 from MerchantCalico/chore/1.21.5

chore: Port to 1.21.5 + some additional fixes.

Author: sylv256

.github/workflows/test-fabric.yml

@@ -24,4 +24,4 @@ jobs:
         uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
 
       - name: Test Fabric
-        run: ./gradlew fabric:runGameTestServer
+        run: ./gradlew fabric:runGameTest

.github/workflows/test-neoforge.yml

@@ -24,4 +24,4 @@ jobs:
         uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
 
       - name: Test NeoForge
-        run: ./gradlew neoforge:runGameTestServer
+        run: ./gradlew neoforge:runGameTest

.gitignore

@@ -22,6 +22,7 @@ eclipse
 run
 runs
 .cache
+.kotlin
 
 # OS
-.DS_Store
+.DS_Store

CHANGELOG.md

@@ -1,5 +1,15 @@
-## Changed
-- tweak: add `GameCondition#getTemplate` for ease of access to condition templates
+## Breaking Changes
+- `silicate:entity_vehicle` must now use the `silicate:vehicle_entity` param type to reference the vehicle entity, with other fields remaining the exact same.
+- `silicate:entity_passenger` must now use the `silicate:passenger_entity` param type to reference the passenger entity, with other fields remaining the exact same.
+- `silicate:entity_tame_owner` must now use the `silicate:owner_entity` param type to reference the owner entity, with other fields remaining the exact same.
+- `silicate:entity_projectile_owner` must now use the `silicate:owner_entity` param type to reference the owner entity, with other fields remaining the exact same.
+- The ContextParamType codec will now return a data error if not present within the registry, or if the class of the registered param type is unable to be casted to the specified class. On a success, this will return the original context param type if it is an exact match in class, otherwise, this will create a new param type if the resulting class can be cast to the specified class.
+
+## Added
+- Ported to 1.21.5.
 
 ## Fixed
-- fix(GameTest): add fake player to player list
+- Fixed `entity_vehicle`, `entity_passenger`, `entity_tame_owner`, `entity_projectile_owner` conditions overriding the original field with the target entity within their inner conditions' context.
+- Fixed issues with registering custom game conditions on NeoForge.
+- Fixed ContextParamType codec creating entirely new param types without checking if a param type of the sort exists already.
+- Fixed ContextParamType codec's entirely new param types not being equal to any param type in the case of casted classes.

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-	id("fabric-loom") version "1.7-SNAPSHOT" apply false
-	id("net.neoforged.moddev") version "2.0.76" apply false
+	id("fabric-loom") version "1.10-SNAPSHOT" apply false
+	id("net.neoforged.moddev") version "2.0.105" apply false
 	id("me.modmuss50.mod-publish-plugin") version net.modgarden.silicate.gradle.Versions.MOD_PUBLISH_PLUGIN apply false
 }

buildSrc/src/main/kotlin/conventions.common.gradle.kts

@@ -49,20 +49,6 @@ dependencies {
 	implementation("org.jetbrains:annotations:24.1.0")
 }
 
-// Declare capabilities on the outgoing configurations.
-// Read more about capabilities here: https://docs.gradle.org/current/userguide/component_capabilities.html#sec:declaring-additional-capabilities-for-a-local-component
-setOf("apiElements", "runtimeElements", "sourcesElements", "javadocElements").forEach { variant ->
-	configurations.getByName(variant).outgoing {
-		capability("$group:${Properties.MOD_ID}-${project.name}:$version")
-		capability("$group:${Properties.MOD_ID}:$version")
-	}
-	publishing.publications.forEach { publication ->
-		if (publication is MavenPublication) {
-			publication.suppressPomMetadataWarningsFor(variant)
-		}
-	}
-}
-
 tasks {
 	named<Jar>("sourcesJar").configure {
 		from(rootProject.file("LICENSE")) {

buildSrc/src/main/kotlin/conventions.loader.gradle.kts

@@ -1,5 +1,3 @@
-import net.modgarden.silicate.gradle.Properties
-
 plugins {
 	id("conventions.common")
 }
@@ -11,19 +9,33 @@ configurations {
 	register("commonResources") {
 		isCanBeResolved = true
 	}
+	register("commonTestJava") {
+		isCanBeResolved = true
+	}
 	register("commonTestResources") {
 		isCanBeResolved = true
 	}
 }
 
-dependencies {
-	compileOnly(project(":common")) {
-		capabilities {
-			requireCapability("$group:${Properties.MOD_ID}")
+gradle.projectsEvaluated {
+	sourceSets {
+		getByName("main") {
+			compileClasspath += project(":common").sourceSets["main"].output
+			runtimeClasspath += project(":common").sourceSets["main"].output
+		}
+		getByName("test") {
+			compileClasspath += project(":common").sourceSets["test"].output
+			runtimeClasspath += project(":common").sourceSets["test"].output
 		}
 	}
+}
+
+dependencies {
+	testCompileOnly(project(":common"))
+
 	"commonJava"(project(":common", "commonJava"))
 	"commonResources"(project(":common", "commonResources"))
+	"commonTestJava"(project(":common", "commonTestJava"))
 	"commonTestResources"(project(":common", "commonTestResources"))
 }
 
@@ -32,6 +44,10 @@ tasks {
 		dependsOn(configurations.getByName("commonJava"))
 		source(configurations.getByName("commonJava"))
 	}
+	named<JavaCompile>("compileTestJava").configure {
+		dependsOn(configurations.getByName("commonTestJava"))
+		source(configurations.getByName("commonTestJava"))
+	}
 	named<ProcessResources>("processResources").configure {
 		dependsOn(configurations.getByName("commonResources"))
 		from(configurations.getByName("commonResources"))

buildSrc/src/main/kotlin/net/modgarden/silicate/gradle/Versions.kt

@@ -1,22 +1,22 @@
 package net.modgarden.silicate.gradle
 
 object Versions {
-	const val MOD = "0.8.0"
+	const val MOD = "0.9.0"
 
-	const val MINECRAFT = "1.21.4"
-	const val PARCHMENT_MINECRAFT = "1.21.4"
-	const val NEOFORM = "$MINECRAFT-20241203.161809"
-	const val PARCHMENT = "2025.01.19"
+	const val MINECRAFT = "1.21.5"
+	const val PARCHMENT_MINECRAFT = "1.21.5"
+	const val NEOFORM = "$MINECRAFT-20250325.162830"
+	const val PARCHMENT = "2025.04.19"
 
-	const val FABRIC_API = "0.116.0+1.21.4"
-	const val FABRIC_LOADER = "0.16.10"
-	const val MOD_MENU = "13.0.1"
+	const val FABRIC_API = "0.128.1+1.21.5"
+	const val FABRIC_LOADER = "0.16.14"
+	const val MOD_MENU = "14.0.0-rc.2"
 	const val FABRIC_LOADER_RANGE = ">=0.16"
-	const val FABRIC_MINECRAFT_RANGE = ">=1.21.4"
+	const val FABRIC_MINECRAFT_RANGE = "1.21.5"
 
-	const val NEOFORGE = "21.4.88-beta"
+	const val NEOFORGE = "21.5.87"
 	const val NEOFORGE_LOADER_RANGE = "[4,)"
-	const val NEOFORGE_MINECRAFT_RANGE = "[1.21.4,)"
+	const val NEOFORGE_MINECRAFT_RANGE = "[1.21.5,1.21.6)"
 
 	const val FABRIC_MIXIN = "0.15.5+mixin.0.8.7"
 	const val MIXIN_EXTRAS = "0.4.1"

common/build.gradle.kts

@@ -44,6 +44,10 @@ configurations {
 		isCanBeResolved = false
 		isCanBeConsumed = true
 	}
+	register("commonTestJava") {
+		isCanBeResolved = false
+		isCanBeConsumed = true
+	}
 	register("commonTestResources") {
 		isCanBeResolved = false
 		isCanBeConsumed = true
@@ -53,7 +57,7 @@ configurations {
 artifacts {
 	add("commonJava", sourceSets["main"].java.sourceDirectories.singleFile)
 	add("commonResources", sourceSets["main"].resources.sourceDirectories.singleFile)
-	add("commonResources", sourceSets["generated"].resources.sourceDirectories.singleFile)
+	add("commonTestJava", sourceSets["test"].java.sourceDirectories.singleFile)
 	add("commonTestResources", sourceSets["test"].resources.sourceDirectories.singleFile)
 }
 

common/src/main/java/net/modgarden/silicate/Silicate.java

@@ -4,28 +4,21 @@
 import net.minecraft.server.MinecraftServer;
 import net.modgarden.silicate.api.SilicateBuiltInRegistries;
 import net.modgarden.silicate.platform.SilicatePlatformHelper;
-import net.modgarden.silicate.test.SilicateGameTests;
 import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.List;
-
 @ApiStatus.Internal
 public class Silicate {
 	public static final String MOD_ID = "silicate";
 	public static final String MOD_NAME = "Silicate";
 	public static final Logger LOG = LoggerFactory.getLogger(MOD_NAME);
-	public static final List<Class<?>> GAME_TESTS = List.of(
-		SilicateGameTests.class
-	);
 	private static MinecraftServer server;
 
 	private static SilicatePlatformHelper helper;
 
 	public static void init() {
 		LOG.info("Initializing Silicate");
-		SilicateBuiltInRegistries.registerAll();
 	}
 
 	public static void setServer(MinecraftServer server) {