Update to 1.21.11-rc2

Author: NichtStudioCode

buildSrc/build.gradle.kts

@@ -6,6 +6,12 @@ repositories {
     gradlePluginPortal()
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 dependencies {
     implementation(libs.paperweight.userdev.plugin)
 

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

@@ -27,7 +27,7 @@ dependencies {
     testRuntimeOnly(libs.junit.platformLauncher)
     testImplementation(libs.mockbukkit)
     testImplementation(libs.logback.classic)
-    testImplementation(libs.paper.api)
+    testImplementation(libs.test.paper.api)
 }
 
 java {

gradle/libs.versions.toml

@@ -1,6 +1,7 @@
 [versions]
 kotlin = "2.2.21"
-paper = "1.21.10-R0.1-SNAPSHOT"
+paper = "1.21.11-rc2-R0.1-SNAPSHOT"
+testpaper = "1.21.10-R0.1-SNAPSHOT"
 
 [libraries]
 commons-provider = { module = "xyz.xenondevs.commons:commons-provider", version = "2.0.0-alpha.8" }
@@ -13,8 +14,8 @@ kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "
 kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
 mockbukkit = { module = "org.mockbukkit.mockbukkit:mockbukkit-v1.21", version = "4.98.0"}
 logback-classic = { module = "ch.qos.logback:logback-classic", version = "1.5.21" }
-paper-api = { module = "io.papermc.paper:paper-api", version.ref = "paper" }
 paperweight-userdev-plugin = { module = "io.papermc.paperweight:paperweight-userdev", version = "2.0.0-beta.19" }
+test-paper-api = { module = "io.papermc.paper:paper-api", version.ref = "testpaper" }
 
 [plugins]
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

invui/src/main/java/xyz/xenondevs/invui/internal/menu/CustomContainerMenu.java

@@ -22,7 +22,7 @@
 import net.minecraft.network.protocol.common.ServerboundPongPacket;
 import net.minecraft.network.protocol.game.*;
 import net.minecraft.resources.RegistryOps;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.util.HashOps;
@@ -116,7 +116,7 @@ public Integer apply(TypedDataComponent<?> typedDataComponent) {
     protected static final HashedStack DIRTY_MARKER = HashedStack.create(new ItemStack(
         BuiltInRegistries.ITEM.wrapAsHolder(Items.DIRT), 1,
         DataComponentPatch.builder()
-            .set(DataComponents.ITEM_MODEL, ResourceLocation.fromNamespaceAndPath("invui", "dirty_marker"))
+            .set(DataComponents.ITEM_MODEL, Identifier.fromNamespaceAndPath("invui", "dirty_marker"))
             .build()
     ), HASH_GENERATOR);
 

invui/src/main/java/xyz/xenondevs/invui/internal/menu/CustomMerchantMenu.java

@@ -5,7 +5,7 @@
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.network.protocol.game.ClientboundMerchantOffersPacket;
 import net.minecraft.network.protocol.game.ServerboundSelectTradePacket;
-import net.minecraft.world.entity.npc.VillagerData;
+import net.minecraft.world.entity.npc.villager.VillagerData;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.component.CustomData;

invui/src/main/java/xyz/xenondevs/invui/internal/menu/CustomRecipeBookPoweredMenu.java

@@ -6,7 +6,7 @@
 import net.minecraft.network.protocol.game.ClientboundPlaceGhostRecipePacket;
 import net.minecraft.network.protocol.game.ServerboundPlaceRecipePacket;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.item.crafting.display.RecipeDisplayEntry;
@@ -55,7 +55,7 @@ public void handleClosed() {
      */
     public void sendGhostRecipe(Key id) {
         var entryRef = new AtomicReference<@Nullable RecipeDisplayEntry>();
-        var rk = ResourceKey.create(Registries.RECIPE, ResourceLocation.fromNamespaceAndPath(id.namespace(), id.value()));
+        var rk = ResourceKey.create(Registries.RECIPE, Identifier.fromNamespaceAndPath(id.namespace(), id.value()));
         MinecraftServer.getServer().getRecipeManager().listDisplaysForRecipe(rk, entryRef::set);
         var entry = entryRef.get();
         if (entry == null)
@@ -87,7 +87,7 @@ private void handleRecipePlace(ServerboundPlaceRecipePacket packet) {
         var rl = displayInfo
             .parent()
             .id()
-            .location();
+            .identifier();
         var key = Key.key(rl.getNamespace(), rl.getPath());
         recipeSelectHandler.accept(key);
     }

invui/src/main/java/xyz/xenondevs/invui/internal/menu/CustomStonecutterMenu.java

@@ -6,7 +6,7 @@
 import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
 import net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.item.ItemStack;
@@ -128,7 +128,7 @@ private List<SelectableRecipe.SingleInputEntry<StonecutterRecipe>> createRecipes
                     Optional.of(new RecipeHolder<>(
                         ResourceKey.create(
                             Registries.RECIPE,
-                            ResourceLocation.fromNamespaceAndPath("invui", "fake_stonecutter_" + MathUtils.RANDOM.nextInt())
+                            Identifier.fromNamespaceAndPath("invui", "fake_stonecutter_" + MathUtils.RANDOM.nextInt())
                         ),
                         new StonecutterRecipe("", ingredient, button.copy())
                     ))