feat(minecraft): merge 1.21.11 updates

Merges #4244

Signed-off-by: Gabriel Harris-Rouquette <[email protected]>

Author: gabizou

SpongeAPI

@@ -58,6 +58,7 @@ public static List<Path[]> resolve() {
 
         final AtomicBoolean hasAPISourceSet = new AtomicBoolean(false);
 
+        boolean skipMixinExtras = false;
         for (final String str : cp) {
             final Path path = Paths.get(str);
             if (!Files.exists(path)) {
@@ -96,6 +97,9 @@ public static List<Path[]> resolve() {
                             }
                             break;
                         case "", "vanilla", "forge", "neoforge":
+                            if ("forge".equals(projectName)) {
+                                skipMixinExtras = true;
+                            }
                             final WeightedPath weightedPath = new WeightedPath(projectName.isEmpty() ? 1 : 2, path);
                             switch (sourceSet.name()) {
                                 case "applaunchConfig":
@@ -132,6 +136,14 @@ public static List<Path[]> resolve() {
                 }
                 continue;
             }
+            // We need to skip mixinextras-common in Forge's UserDev mode as this will cause duplicate module
+            // errors with JPMS.
+            if (fileName.startsWith("mixinextras-common") && skipMixinExtras) {
+                if (Bootstrap.DEBUG) {
+                    System.out.println("Ignored: " + path);
+                }
+                continue;
+            }
 
             if (bootNames.contains(fileName) || fileName.startsWith("org.jacoco.core-") || fileName.startsWith("mockito-") || fileName.startsWith("objenesis-")) {
                 if (Bootstrap.DEBUG) {
@@ -158,7 +170,7 @@ public static List<Path[]> resolve() {
         final List<Path[]> classpath = new ArrayList<>();
 
         for (final Path lib : bootLibs) {
-            classpath.add(new Path[] { lib });
+            classpath.add(new Path[]{lib});
         }
 
         for (final List<WeightedPath> sourceSets : bootUnions.values()) {

bootstrap/src/main/java/org/spongepowered/bootstrap/dev/DevClasspath.java

@@ -2,5 +2,5 @@ name=SpongeForge
 implementation=Forge
 description=The SpongeAPI implementation for MinecraftForge
 
-forgeVersion=60.0.1
+forgeVersion=61.0.1
 mixinConfigs=mixins.spongeforge.accessors.json,mixins.spongeforge.api.json,mixins.spongeforge.inventory.json,mixins.spongeforge.inventory.shared.json,mixins.spongeforge.core.json,mixins.spongeforge.core.shared.json,mixins.spongeforge.tracker.json

forge/gradle.properties

@@ -26,7 +26,7 @@
 
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraftforge.network.ForgePayload;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.common.hooks.ChannelHooks;
@@ -46,6 +46,6 @@ public void registerPlatformChannels(final Consumer<CustomPacketPayload.Type<Spo
     @Override
     public CustomPacketPayload createRegisterPayload(final Set<ResourceKey> channels) {
         final FriendlyByteBuf payload = (FriendlyByteBuf) RegisterChannelUtil.encodePayload(channels);
-        return new ForgePayload((ResourceLocation) (Object) Constants.Channels.REGISTER_KEY, null, b -> b.writeBytes(payload));
+        return new ForgePayload((Identifier) (Object) Constants.Channels.REGISTER_KEY, null, b -> b.writeBytes(payload));
     }
 }

forge/src/main/java/org/spongepowered/forge/hook/ForgeChannelHooks.java

@@ -26,7 +26,7 @@
 
 import com.google.common.collect.Maps;
 import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraftforge.registries.ForgeRegistry;
 import net.minecraftforge.registries.IForgeRegistry;
 import org.spongepowered.api.ResourceKey;
@@ -55,10 +55,10 @@ public abstract class ForgeRegistryMixin_Forge<V> {
     private final Map<ResourceKey, RegistryBridge<V>> forge$parents = Maps.newHashMap();
     private boolean forge$warnedIfNoParent;
 
-    @Inject(method = "add(ILnet/minecraft/resources/ResourceLocation;Ljava/lang/Object;Ljava/lang/String;)I", at = @At("TAIL"))
-    public void forge$writeToParent(final int id, final ResourceLocation key, final V value, final String owner, final CallbackInfoReturnable<Integer> cir) {
+    @Inject(method = "add(ILnet/minecraft/resources/Identifier;Ljava/lang/Object;Ljava/lang/String;)I", at = @At("TAIL"))
+    public void forge$writeToParent(final int id, final Identifier key, final V value, final String owner, final CallbackInfoReturnable<Integer> cir) {
         final ResourceKey root = (ResourceKey) (Object) this.key.registry();
-        final ResourceKey location = (ResourceKey) (Object) this.key.location();
+        final var location = (ResourceKey) (Object) this.key.identifier();
 
         if (!this.forge$warnedIfNoParent && this.forge$parents.isEmpty()) {
             // We only care about minecraft namespaced registries, as that is what we've got parents for.

forge/src/mixins/java/org/spongepowered/forge/mixin/core/minecraftforge/registries/ForgeRegistryMixin_Forge.java

@@ -24,7 +24,7 @@
  */
 package org.spongepowered.forge.mixin.core.minecraftforge.registries;
 
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraftforge.registries.ForgeRegistry;
 import net.minecraftforge.registries.RegistryManager;
 import org.spongepowered.asm.mixin.Mixin;
@@ -39,7 +39,7 @@ public class RegistryManagerMixin_Forge {
 
     @SuppressWarnings("UnstableApiUsage")
     @Inject(method = "takeSnapshot", at = @At("RETURN"))
-    public void forge$dontSendSpongeDataToClient(boolean savingToDisc, CallbackInfoReturnable<Map<ResourceLocation, ForgeRegistry.Snapshot>> cir) {
+    public void forge$dontSendSpongeDataToClient(boolean savingToDisc, CallbackInfoReturnable<Map<Identifier, ForgeRegistry.Snapshot>> cir) {
         if (savingToDisc) {
             return;
         }

forge/src/mixins/java/org/spongepowered/forge/mixin/core/minecraftforge/registries/RegistryManagerMixin_Forge.java

@@ -28,7 +28,7 @@
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraftforge.network.NetworkRegistry;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
@@ -49,7 +49,7 @@ public abstract class ClientboundCustomPayloadPacketMixin_Forge {
     // @formatter: on
 
     @Inject(method = { "lambda$static$0", "lambda$static$2" }, at = @At("HEAD"), cancellable = true)
-    private static void forge$getSpongeCustomPacketPayload(final ResourceLocation channelKey, final CallbackInfoReturnable<StreamCodec<FriendlyByteBuf, ? extends CustomPacketPayload>> cir) {
+    private static void forge$getSpongeCustomPacketPayload(final Identifier channelKey, final CallbackInfoReturnable<StreamCodec<FriendlyByteBuf, ? extends CustomPacketPayload>> cir) {
         if (NetworkRegistry.findTarget(channelKey) != null) {
             return;
         }

forge/src/mixins/java/org/spongepowered/forge/mixin/core/network/protocol/common/ClientboundCustomPayloadPacketMixin_Forge.java

@@ -28,7 +28,7 @@
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraftforge.network.NetworkRegistry;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
@@ -49,7 +49,7 @@ public abstract class ServerboundCustomPayloadPacketMixin_Forge {
     // @formatter: on
 
     @Inject(method = { "lambda$static$0" }, at = @At("HEAD"), cancellable = true)
-    private static void forge$getSpongeCustomPacketPayload(final ResourceLocation channelKey, final CallbackInfoReturnable<StreamCodec<FriendlyByteBuf, ? extends CustomPacketPayload>> cir) {
+    private static void forge$getSpongeCustomPacketPayload(final Identifier channelKey, final CallbackInfoReturnable<StreamCodec<FriendlyByteBuf, ? extends CustomPacketPayload>> cir) {
         if (NetworkRegistry.findTarget(channelKey) != null) {
             return;
         }

forge/src/mixins/java/org/spongepowered/forge/mixin/core/network/protocol/common/ServerboundCustomPayloadPacketMixin_Forge.java

@@ -33,6 +33,7 @@
 import net.minecraft.server.RegistryLayer;
 import net.minecraft.server.ReloadableServerResources;
 import net.minecraft.server.packs.resources.ResourceManager;
+import net.minecraft.server.permissions.PermissionSet;
 import net.minecraft.world.flag.FeatureFlagSet;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -44,9 +45,13 @@
 @Mixin(ReloadableServerResources.class)
 public abstract class ReloadableServerResourcesMixin_Forge {
 
-    @WrapOperation(method = "lambda$loadResources$1", at = @At(value = "NEW", target = "(Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/world/flag/FeatureFlagSet;Lnet/minecraft/commands/Commands$CommandSelection;Ljava/util/List;I)Lnet/minecraft/server/ReloadableServerResources;"))
-    private static ReloadableServerResources impl$onCreateResources(final LayeredRegistryAccess<RegistryLayer> $$0, final HolderLookup.Provider $$1, final FeatureFlagSet $$2,
-            final Commands.CommandSelection $$3, final List<?> $$4, final int $$5, final Operation<ReloadableServerResources> original, final @Local(argsOnly = true) ResourceManager resourceManager) {
+    @WrapOperation(method = "lambda$loadResources$1", at = @At(value = "NEW",
+        target = "(Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/world/flag/FeatureFlagSet;Lnet/minecraft/commands/Commands$CommandSelection;Ljava/util/List;Lnet/minecraft/server/permissions/PermissionSet;)Lnet/minecraft/server/ReloadableServerResources;"
+    ))
+    private static ReloadableServerResources impl$onCreateResources(
+        final LayeredRegistryAccess<RegistryLayer> $$0, final HolderLookup.Provider $$1, final FeatureFlagSet $$2,
+        final Commands.CommandSelection $$3, final List<?> $$4, final PermissionSet $$5,
+        final Operation<ReloadableServerResources> original, final @Local(argsOnly = true) ResourceManager resourceManager) {
         final ReloadableServerResources instance = original.call($$0, $$1, $$2, $$3, $$4, $$5);
         if (instance.getCommands().getDispatcher() instanceof final DelegatingCommandDispatcher delegatingCommandDispatcher) {
             delegatingCommandDispatcher.permissionService(((ResourceManagerBridge) resourceManager).bridge$services().permissionService());

forge/src/mixins/java/org/spongepowered/forge/mixin/core/server/ReloadableServerResourcesMixin_Forge.java

@@ -27,7 +27,7 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.tags.TagEntry;
 import net.minecraft.tags.TagLoader;
 import org.spongepowered.asm.mixin.Mixin;
@@ -56,7 +56,7 @@ public abstract class TagLoaderMixin_Forge<T> implements TagLoaderBridge<T> {
     }
 
     @Inject(method = "lambda$build$6", at = @At("HEAD"))
-    private void forge$onStartBuildingTag(final TagEntry.Lookup<T> $$0x, final Map<ResourceLocation, Collection<T>> $$1x, final ResourceLocation $$2x,
+    private void forge$onStartBuildingTag(final TagEntry.Lookup<T> $$0x, final Map<Identifier, Collection<T>> $$1x, final Identifier $$2x,
             final @Coerce Object $$3x, final CallbackInfo ci) {
         this.bridge$buildingTagKey($$2x);
     }