Merge branch '1.21.1' into 1.21.4

# Conflicts:
#	CHANGELOG.md
#	buildSrc/src/main/kotlin/net/modgarden/silicate/gradle/Versions.kt
#	common/src/main/java/net/modgarden/silicate/api/condition/GameCondition.java
#	common/src/main/java/net/modgarden/silicate/api/condition/TypedGameCondition.java
#	common/src/main/java/net/modgarden/silicate/test/SilicateGameTests.java

Author: sylv256

CHANGELOG.md

@@ -1,5 +1,5 @@
-## Added
-- Swapped ConditionTemplate out for Holders.
+## Changed
+- tweak: add `GameCondition#getTemplate` for ease of access to condition templates
 
 ## Fixed
-- Fixed GameConditions being unable to be sent from the server to clients.
+- fix(GameTest): add fake player to player list

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

@@ -1,7 +1,7 @@
 package net.modgarden.silicate.gradle
 
 object Versions {
-	const val MOD = "0.7.0"
+	const val MOD = "0.8.0"
 
 	const val MINECRAFT = "1.21.4"
 	const val PARCHMENT_MINECRAFT = "1.21.4"

common/src/main/java/net/modgarden/silicate/api/SilicateBuiltInRegistries.java

@@ -42,6 +42,9 @@ public static <T> HolderLookup.RegistryLookup<T> lookupOrThrow(ResourceKey<Regis
 		return getRegistryAccess().orElseThrow().lookupOrThrow(registry);
 	}
 
+	/**
+	 * Get free {@link RegistryAccess} anywhere you go!
+	 */
 	private static Optional<RegistryAccess> getRegistryAccess() {
 		if (Thread.currentThread().getName().equals("Server thread")) {
 			return Optional.of(Silicate.getServer().registryAccess());

common/src/main/java/net/modgarden/silicate/api/condition/GameCondition.java

@@ -1,11 +1,11 @@
 package net.modgarden.silicate.api.condition;
 
-import com.mojang.datafixers.util.Either;
 import com.mojang.serialization.Codec;
-import com.mojang.serialization.DataResult;
 import com.mojang.serialization.MapCodec;
 import net.minecraft.core.Holder;
 import net.minecraft.resources.RegistryFileCodec;
+import net.minecraft.core.Holder;
+import net.minecraft.resources.RegistryFileCodec;
 import net.minecraft.resources.RegistryFixedCodec;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
@@ -14,10 +14,7 @@
 import net.modgarden.silicate.api.condition.builtin.EntityPassengerCondition;
 import net.modgarden.silicate.api.condition.builtin.EntityVehicleCondition;
 import net.modgarden.silicate.api.context.GameContext;
-import org.jetbrains.annotations.ApiStatus;
 
-import javax.xml.crypto.Data;
-import java.util.function.Function;
 import java.util.function.Predicate;
 
 /**
@@ -34,7 +31,6 @@
 public interface GameCondition<T extends GameCondition<T>> extends Predicate<GameContext> {
 	Codec<GameCondition<?>> TYPED_CODEC = SilicateBuiltInRegistries.GAME_CONDITION_TYPE.byNameCodec()
 			.dispatch("type", GameCondition::getType, GameConditionType::codec);
-	@SuppressWarnings("unchecked") // We use ConditionTemplate which uses raw types. Everything is checked at runtime.
 	Codec<Holder<GameCondition<?>>> CODEC = RegistryFileCodec.create(SilicateRegistries.CONDITION_TEMPLATE, TYPED_CODEC);
 
 	@Override
@@ -46,4 +42,20 @@ public interface GameCondition<T extends GameCondition<T>> extends Predicate<Gam
 	MapCodec<T> getCodec();
 
 	GameConditionType<T> getType();
+
+	/**
+	 * A helper function for retrieving condition templates.
+	 * @param location The condition template's {@link ResourceLocation}.
+	 * @return The condition template.
+	 */
+	static Holder<GameCondition<?>> getTemplate(ResourceLocation location) {
+		return SilicateBuiltInRegistries
+				.lookupOrThrow(SilicateRegistries.CONDITION_TEMPLATE)
+				.getOrThrow(
+						ResourceKey.create(
+								SilicateRegistries.CONDITION_TEMPLATE,
+								location
+						)
+				);
+	}
 }

common/src/main/java/net/modgarden/silicate/api/condition/TypedGameCondition.java

@@ -27,8 +27,9 @@ private static <P> DataResult<Holder<TypedGameCondition<?, P>>> validate(Holder<
 		}
 	}
 
-	private static GameCondition<?> toGameCondition(TypedGameCondition<?, ?> typedCondition) {
-		return typedCondition;
+	@SuppressWarnings("unchecked") // The underlying type can be cast.
+	private static <P> Holder<GameCondition<?>> toGameCondition(Holder<TypedGameCondition<?, P>> typedCondition) {
+		return (Holder<GameCondition<?>>) (Object) typedCondition;
 	}
 
 	/**
@@ -37,12 +38,11 @@ private static GameCondition<?> toGameCondition(TypedGameCondition<?, ?> typedCo
 	 * @return The typed codec.
 	 * @param <P> The value type of the parameter type.
 	 */
-	@SuppressWarnings("unchecked")
 	static <P> Codec<Holder<TypedGameCondition<?, P>>> getTypedCodec(Class<P> clazz) {
 		return GameCondition.CODEC
 				.comapFlatMap(
 						condition -> validate(condition, clazz),
-						holder -> (Holder<GameCondition<?>>)(Object)holder
+						TypedGameCondition::toGameCondition
 				);
 	}
 

common/src/main/java/net/modgarden/silicate/test/SilicateGameTests.java

@@ -181,6 +181,9 @@ public static void conditions(GameTestHelper helper) throws InvalidContextParame
 		SkeletonHorse skeletonHorse = helper.getEntities(EntityType.SKELETON_HORSE).getFirst();
 		Skeleton skeleton = helper.getEntities(EntityType.SKELETON).getFirst();
 		ServerPlayer player = createFakePlayer(helper);
+		// Fake players need to be added to the player list manually
+		// This is necessary for OwnableEntity#getOwner(UUID)
+		helper.getLevel().players().add(player);
 		ContextParamMap paramMap = createParamMap(
 			createState(),
 			createOrigin(),
@@ -310,7 +313,7 @@ public static void conditions(GameTestHelper helper) throws InvalidContextParame
 				vehicleCondition.test(context),
 				"EntityVehicleCondition test unexpectedly succeeded"
 		);
-		skeletonHorse.setOwnerUUID(Objects.requireNonNull(helper.getLevel().getRandomPlayer()).getUUID());
+		skeletonHorse.setOwnerUUID(player.getUUID());
 		arrow.setOwner(skeleton);
 		skeleton.startRiding(skeletonHorse);
 		helper.assertTrue(
@@ -394,15 +397,9 @@ public static void conditionTemplates(GameTestHelper helper) throws InvalidConte
 		);
 		skeleton.startRiding(skeletonHorse);
 		GameContext context = GameContext.of(helper.getLevel(), paramMap);
-		Holder<GameCondition<?>> always = helper.getLevel()
-				.registryAccess()
-				.registryOrThrow(SilicateRegistries.CONDITION_TEMPLATE)
-				.getHolderOrThrow(ResourceKey.create(SilicateRegistries.CONDITION_TEMPLATE, ResourceLocation.fromNamespaceAndPath("test", "true")));
+		Holder<GameCondition<?>> always = GameCondition.getTemplate(ResourceLocation.fromNamespaceAndPath("test", "true"));
 		helper.assertTrue(always.value().test(context), "ConditionTemplate test:true failed");
-		Holder<GameCondition<?>> ridingOnly = helper.getLevel()
-				.registryAccess()
-				.registryOrThrow(SilicateRegistries.CONDITION_TEMPLATE)
-				.getHolderOrThrow(ResourceKey.create(SilicateRegistries.CONDITION_TEMPLATE, ResourceLocation.fromNamespaceAndPath("test", "riding_only")));
+		Holder<GameCondition<?>> ridingOnly = GameCondition.getTemplate(ResourceLocation.fromNamespaceAndPath("test", "riding_only"));
 		helper.assertTrue(ridingOnly.value().test(context), "ConditionTemplate test:riding_only failed");
 		helper.succeed();
 	}