Update to 1.21.5

Author: Choonster

build.gradle

@@ -180,7 +180,7 @@ dependencies {
     // TODO: Jade doesn't support Forge any more
 //    implementation fg.deobf("curse.maven:jade-324717:${jade_file_id}")
 
-    implementation "com.github.glitchfiend:TerraBlender-forge:1.21.4-${terrablender_version}"
+    implementation "com.github.glitchfiend:TerraBlender-forge:1.21.5-${terrablender_version}"
 
     // Example mod dependency using a mod jar from ./libs with a flat dir repository
     // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar

gradle.properties

@@ -6,15 +6,15 @@ org.gradle.daemon=false
 ## Environment Properties
 
 # The Minecraft version must agree with the Forge version to get a valid artifact
-minecraft_version=1.21.4
+minecraft_version=1.21.5
 
 # The Minecraft version range can use any release version of Minecraft as bounds.
 # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
 # as they do not follow standard versioning conventions.
-minecraft_version_range=[1.21.4,1.22)
+minecraft_version_range=[1.21.5,1.22)
 
 # The Forge version must agree with the Minecraft version to get a valid artifact
-forge_version=54.0.35
+forge_version=55.0.3
 
 # The Forge version range can use any version of Forge as bounds or match the loader version range
 forge_version_range=[0,)
@@ -40,11 +40,11 @@ mapping_channel=official
 
 # The mapping version to query from the mapping channel.
 # This must match the format required by the mapping channel.
-mapping_version=1.21.4
+mapping_version=1.21.5
 
 jei_version=19.21.0.247
 
-terrablender_version=4.3.0.2
+terrablender_version=5.0.0.0
 
 # Minecraft uses Apache HTTP Client 4.5.14, so we have to use the same version of the Fluent API
 httpclient_version=4.5.14
@@ -62,7 +62,7 @@ mod_name=TestMod3
 mod_license=MIT
 
 # The mod version. See https://semver.org/
-mod_version=22.0.0
+mod_version=23.0.0
 
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.

src/main/java/choonster/testmod3/TestMod3.java

@@ -53,7 +53,7 @@ public TestMod3(final FMLJavaModLoadingContext context) {
 		ModCreativeTabs.initialise(modEventBus);
 		ModDataComponents.initialise(modEventBus);
 		ModClientScreenTypes.initialise(modEventBus);
-		ModItemSubPredicates.initialise(modEventBus);
+		ModDataComponentPredicates.initialise(modEventBus);
 	}
 
 	@SubscribeEvent

src/main/java/choonster/testmod3/advancements/criterion/ItemFluidContainerPredicate.java

@@ -2,13 +2,14 @@
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.minecraft.advancements.critereon.ItemSubPredicate;
 import net.minecraft.advancements.critereon.MinMaxBounds;
 import net.minecraft.advancements.critereon.NbtPredicate;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderGetter;
 import net.minecraft.core.HolderSet;
 import net.minecraft.core.RegistryCodecs;
+import net.minecraft.core.component.DataComponentGetter;
+import net.minecraft.core.component.predicates.DataComponentPredicate;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.tags.TagKey;
@@ -28,7 +29,7 @@ public record ItemFluidContainerPredicate(
 		Optional<HolderSet<Fluid>> fluid,
 		MinMaxBounds.Ints amount,
 		Optional<NbtPredicate> nbt
-) implements ItemSubPredicate {
+) implements DataComponentPredicate {
 	public static Codec<ItemFluidContainerPredicate> CODEC = RecordCodecBuilder.create(builder ->
 			builder.group(
 
@@ -47,8 +48,13 @@ public record ItemFluidContainerPredicate(
 			).apply(builder, ItemFluidContainerPredicate::new)
 	);
 
+	// TODO: Reimplement if/when Forge reimplements IFluidHandler - https://github.com/MinecraftForge/MinecraftForge/issues/10408
 	@Override
-	public boolean matches(final ItemStack item) {
+	public boolean matches(final DataComponentGetter getter) {
+		if (!(getter instanceof final ItemStack item)) {
+			return false;
+		}
+
 		final var fluidContained = FluidUtil.getFluidContained(item);
 		if (fluidContained.isEmpty()) {
 			return false;

src/main/java/choonster/testmod3/client/keybinding/KeyMappingHandler.java

@@ -75,7 +75,7 @@ private static void placeHeldBlock() {
 			if (actionResult == InteractionResult.SUCCESS) {
 				clientPlayer.swing(hand);
 
-				if (!heldItem.isEmpty() && (heldItem.getCount() != heldItemCount || gameMode.hasInfiniteItems())) {
+				if (!heldItem.isEmpty() && (heldItem.getCount() != heldItemCount || clientPlayer.hasInfiniteMaterials())) {
 					MINECRAFT.gameRenderer.itemInHandRenderer.itemUsed(hand);
 				}
 

src/main/java/choonster/testmod3/data/TestMod3LootModifierProvider.java

@@ -6,8 +6,13 @@
 import choonster.testmod3.world.level.storage.loot.modifiers.ItemLootModifier;
 import choonster.testmod3.world.level.storage.loot.modifiers.LootTableLootModifier;
 import choonster.testmod3.world.level.storage.loot.predicates.MatchBlockTag;
-import net.minecraft.advancements.critereon.*;
+import net.minecraft.advancements.critereon.DataComponentMatchers;
+import net.minecraft.advancements.critereon.EnchantmentPredicate;
+import net.minecraft.advancements.critereon.ItemPredicate;
+import net.minecraft.advancements.critereon.MinMaxBounds;
 import net.minecraft.core.HolderLookup;
+import net.minecraft.core.component.predicates.DataComponentPredicates;
+import net.minecraft.core.component.predicates.EnchantmentsPredicate;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.data.PackOutput;
 import net.minecraft.tags.BlockTags;
@@ -81,16 +86,20 @@ private LootItemCondition.Builder hasSilkTouch(final HolderLookup.Provider regis
 
 		return MatchTool.toolMatches(
 				ItemPredicate.Builder.item()
-						.withSubPredicate(
-								ItemSubPredicates.ENCHANTMENTS,
-								ItemEnchantmentsPredicate.enchantments(
-										List.of(
-												new EnchantmentPredicate(
-														enchantments.getOrThrow(Enchantments.SILK_TOUCH),
-														MinMaxBounds.Ints.atLeast(1)
+						.withComponents(
+								DataComponentMatchers.Builder.components()
+										.partial(
+												DataComponentPredicates.ENCHANTMENTS,
+												EnchantmentsPredicate.enchantments(
+														List.of(
+																new EnchantmentPredicate(
+																		enchantments.getOrThrow(Enchantments.SILK_TOUCH),
+																		MinMaxBounds.Ints.atLeast(1)
+																)
+														)
 												)
 										)
-								)
+										.build()
 						)
 		);
 	}

src/main/java/choonster/testmod3/data/TestMod3RecipeProvider.java

@@ -8,13 +8,14 @@
 import choonster.testmod3.data.crafting.recipe.ShapedArmourUpgradeRecipeBuilder;
 import choonster.testmod3.data.crafting.recipe.ShapelessCuttingRecipeBuilder;
 import choonster.testmod3.data.crafting.recipe.ShapelessFluidContainerRecipeBuilder;
+import choonster.testmod3.init.ModDataComponentPredicates;
 import choonster.testmod3.init.ModFluids;
-import choonster.testmod3.init.ModItemSubPredicates;
 import choonster.testmod3.init.ModItems;
 import choonster.testmod3.util.RegistryUtil;
 import choonster.testmod3.world.item.crafting.ingredient.FluidContainerIngredient;
 import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.advancements.Criterion;
+import net.minecraft.advancements.critereon.DataComponentMatchers;
 import net.minecraft.advancements.critereon.InventoryChangeTrigger;
 import net.minecraft.advancements.critereon.ItemPredicate;
 import net.minecraft.advancements.critereon.MinMaxBounds;
@@ -224,11 +225,15 @@ protected void buildRecipes() {
 					.requires(staticGasContainer)
 					.unlockedBy("has_static_gas_bucket", has(ModFluids.STATIC_GAS.getBucket().get()))
 					.unlockedBy("has_static_gas_container", inventoryTrigger(
-							ItemPredicate.Builder.item().withSubPredicate(
-									ModItemSubPredicates.FLUID_CONTAINER.get(),
-									ItemFluidContainerPredicate.Builder.create()
-											.of(staticGas.getFluid())
-											.withAmount(MinMaxBounds.Ints.atLeast(staticGas.getAmount()))
+							ItemPredicate.Builder.item().withComponents(
+									DataComponentMatchers.Builder.components()
+											.partial(
+													ModDataComponentPredicates.FLUID_CONTAINER.get(),
+													ItemFluidContainerPredicate.Builder.create()
+															.of(staticGas.getFluid())
+															.withAmount(MinMaxBounds.Ints.atLeast(staticGas.getAmount()))
+															.build()
+											)
 											.build()
 							)
 					))