Fix MC 1.21.11 upmerge compilation errors (#193)

* Initial plan

* Fix upmerge compilation errors for MC 1.21.11

Co-authored-by: rubensworks <440384+rubensworks@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: rubensworks <440384+rubensworks@users.noreply.github.com>

Author: Copilot

gradle.properties

@@ -32,6 +32,6 @@ org.gradle.caching=true
 
 # Dependencies
 cyclopscore_version=1.25.5-871
-integrateddynamics_version=1.24.1-1463
+integrateddynamics_version=1.24.1-1652
 commoncapabilities_version=2.9.7-303
 integratedtunnels_version=1.8.30-534

src/main/java/org/cyclops/integratedcrafting/gametest/GameTestsAdvancements.java

@@ -4,7 +4,7 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.gametest.framework.GameTestAssertException;
 import net.minecraft.gametest.framework.GameTestHelper;
-import net.minecraft.nbt.Tag;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.TagParser;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
@@ -21,7 +21,6 @@
 import org.cyclops.integrateddynamics.RegistryEntries;
 import org.cyclops.integrateddynamics.api.evaluate.variable.IValue;
 import org.cyclops.integrateddynamics.api.evaluate.variable.IVariable;
-import org.cyclops.integrateddynamics.api.evaluate.variable.ValueDeseralizationContext;
 import org.cyclops.integrateddynamics.api.part.PartPos;
 import org.cyclops.integrateddynamics.api.part.PartTarget;
 import org.cyclops.integrateddynamics.api.part.write.IPartStateWriter;
@@ -31,6 +30,7 @@
 import org.cyclops.integrateddynamics.core.evaluate.variable.Variable;
 import org.cyclops.integrateddynamics.core.helper.PartHelpers;
 import org.cyclops.integrateddynamics.core.part.event.PartVariableDrivenVariableContentsUpdatedEvent;
+import org.cyclops.integrateddynamics.core.test.TestHelpers;
 
 import static org.cyclops.integratedcrafting.gametest.GameTestHelpersIntegratedCrafting.createBasicNetwork;
 import static org.cyclops.integratedcrafting.gametest.GameTestHelpersIntegratedCrafting.enableRecipeInWriter;
@@ -161,20 +161,19 @@ public void testAdvancementInsertRecipePlanks(GameTestHelper helper) {
 
         // Deserialize the recipe value from the exact same SNBT that the advancement JSON expects.
         // This guarantees ValuePredicate.test() will find equal values via ValueHelpers.areValuesEqual().
-        Tag recipeTag;
+        CompoundTag recipeTag;
         try {
             recipeTag =
-                    TagParser.parseTag(
+                    TagParser.parseCompoundFully(
                             "{output:{\"minecraft:itemstack\":[{id:\"minecraft:oak_planks\",Count:4}]},"
                                     + "input:{\"minecraft:itemstack\":[{val:[{condition:5,prototype:{id:\"minecraft:oak_log\",Count:1}}],type:0b}]}}");
         } catch (com.mojang.brigadier.exceptions.CommandSyntaxException e) {
             throw new RuntimeException(e);
         }
         IValue recipeValue =
-                ValueHelpers.deserializeRaw(
-                        ValueDeseralizationContext.of(helper.getLevel()),
-                        ValueTypes.OBJECT_RECIPE,
-                        recipeTag);
+                TestHelpers.deserialize(
+                        recipeTag,
+                        valueInput -> ValueHelpers.deserializeRaw(valueInput, ValueTypes.OBJECT_RECIPE));
         IVariable<?> variable = new Variable<>(recipeValue);
 
         // Fire the event directly, mirroring what PartTypeInterfaceCrafting.State.reloadRecipe() does
@@ -317,20 +316,19 @@ public void testAdvancementCraftCraftingWriterNegative(GameTestHelper helper) {
     public void testAdvancementInsertRecipePlanksNegative(GameTestHelper helper) {
         ServerPlayer player = helper.makeMockServerPlayerInLevel();
 
-        Tag recipeTag;
+        CompoundTag recipeTag;
         try {
             recipeTag =
-                    TagParser.parseTag(
+                    TagParser.parseCompoundFully(
                             "{output:{\"minecraft:itemstack\":[{id:\"minecraft:oak_planks\",Count:4}]},"
                                     + "input:{\"minecraft:itemstack\":[{val:[{condition:5,prototype:{id:\"minecraft:oak_log\",Count:1}}],type:0b}]}}");
         } catch (com.mojang.brigadier.exceptions.CommandSyntaxException e) {
             throw new RuntimeException(e);
         }
         IValue recipeValue =
-                ValueHelpers.deserializeRaw(
-                        ValueDeseralizationContext.of(helper.getLevel()),
-                        ValueTypes.OBJECT_RECIPE,
-                        recipeTag);
+                TestHelpers.deserialize(
+                        recipeTag,
+                        valueInput -> ValueHelpers.deserializeRaw(valueInput, ValueTypes.OBJECT_RECIPE));
         IVariable<?> variable = new Variable<>(recipeValue);
 
         // Fire with wrong part type (crafting_writer instead of interface_crafting)

src/main/java/org/cyclops/integratedcrafting/gametest/GameTestsItemsCraft.java

@@ -791,15 +791,15 @@ public void testItemsCraftDeadBushTagReusableNeedsCrafting(GameTestHelper helper
         GameTestHelpersIntegratedCrafting.INetworkPositions<PartTypeInterfaceCrafting.State> positions = createBasicNetwork(helper, POS, Blocks.CRAFTING_TABLE, Blocks.CRAFTING_TABLE);
 
         // Insert items in interface chest: no shears, but iron ingots to craft them
-        ChestBlockEntity chestIn = helper.getBlockEntity(POS.east());
+        ChestBlockEntity chestIn = helper.getBlockEntity(POS.east(), ChestBlockEntity.class);
         chestIn.setItem(0, new ItemStack(Items.IRON_INGOT, 2));
         chestIn.setItem(1, new ItemStack(Items.SPRUCE_SAPLING, 10));
 
         // Add dead bush recipe with reusable shears to crafting interface 0
         createDeadBushTagReusableRecipe(helper, positions);
 
         // Add shears recipe to crafting interface 1
-        positions.interfaceRecipeAdders().get(1).accept(Triple.of(0, RecipeType.CRAFTING, ResourceLocation.fromNamespaceAndPath("minecraft", "shears")));
+        positions.interfaceRecipeAdders().get(1).accept(Triple.of(0, RecipeType.CRAFTING, Identifier.fromNamespaceAndPath("minecraft", "shears")));
 
         // Speed up crafting interfaces, to craft once every tick
         GameTestHelpersIntegratedCrafting.setCraftingInterfaceUpdateInterval(positions.interfaces().get(0), 1);