feat(minecraft): update to 25w46a

Notable Changes:
- AbstractMount for carrier handling for Horses and
Nautili(sp?)

See https://minecraft.wiki/w/Java_Edition_25w46a

Author: gabizou

SpongeAPI

@@ -27,7 +27,6 @@
 import com.github.javaparser.utils.Log;
 import com.mojang.datafixers.util.Pair;
 import net.minecraft.SharedConstants;
-import net.minecraft.util.Util;
 import net.minecraft.commands.Commands.CommandSelection;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.LayeredRegistryAccess;
@@ -44,6 +43,7 @@
 import net.minecraft.server.packs.resources.MultiPackResourceManager;
 import net.minecraft.server.permissions.LevelBasedPermissionSet;
 import net.minecraft.tags.TagLoader;
+import net.minecraft.util.Util;
 import net.minecraft.world.level.WorldDataConfiguration;
 import org.spongepowered.vanilla.generator.item.ItemRegistries;
 import org.spongepowered.vanilla.generator.world.TagRegistries;

generator/src/main/java/org/spongepowered/vanilla/generator/GeneratorMain.java

@@ -11,7 +11,7 @@ mixinConfigs=mixins.sponge.accessors.json,mixins.sponge.api.json,mixins.sponge.c
   mixins.sponge.entityactivation.json,mixins.sponge.exploit.json,mixins.sponge.inventory.json,mixins.sponge.movementcheck.json,\
   mixins.sponge.tracker.json,mixins.sponge.ipforward.json,mixins.sponge.optimization.json,mixins.sponge.test.json
 
-minecraftVersion=25w45a
+minecraftVersion=25w46a
 recommendedVersion=0-SNAPSHOT
 
 org.gradle.dependency.verification.console=verbose

gradle.properties

@@ -24,14 +24,14 @@
  */
 package org.spongepowered.common.accessor.world.inventory;
 
-import net.minecraft.world.entity.animal.horse.AbstractHorse;
-import net.minecraft.world.inventory.HorseInventoryMenu;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.inventory.AbstractMountInventoryMenu;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-@Mixin(HorseInventoryMenu.class)
-public interface HorseInventoryMenuAccessor {
+@Mixin(AbstractMountInventoryMenu.class)
+public interface AbstractMountInventoryMenuAccessor {
 
-    @Accessor("horse") AbstractHorse accessor$horse();
+    @Accessor("mount") LivingEntity accessor$mount();
 
 }

…nventory/HorseInventoryMenuAccessor.java …/AbstractMountInventoryMenuAccessor.javasrc/accessors/java/org/spongepowered/common/accessor/world/inventory/HorseInventoryMenuAccessor.java renamed to src/accessors/java/org/spongepowered/common/accessor/world/inventory/AbstractMountInventoryMenuAccessor.java src/accessors/java/org/spongepowered/common/accessor/world/inventory/HorseInventoryMenuAccessor.java renamed to src/accessors/java/org/spongepowered/common/accessor/world/inventory/AbstractMountInventoryMenuAccessor.java

@@ -138,7 +138,7 @@
     "world.inventory.BrewingStandMenuAccessor",
     "world.inventory.DispenserMenuAccessor",
     "world.inventory.HopperMenuAccessor",
-    "world.inventory.HorseInventoryMenuAccessor",
+    "world.inventory.AbstractMountInventoryMenuAccessor",
     "world.inventory.ItemCombinerMenuAccessor",
     "world.inventory.MerchantMenuAccessor",
     "world.inventory.ResultSlotAccessor",

src/accessors/resources/mixins.sponge.accessors.json

@@ -49,11 +49,11 @@
 import org.spongepowered.common.SpongeCommon;
 import org.spongepowered.common.accessor.world.inventory.AbstractContainerMenuAccessor;
 import org.spongepowered.common.accessor.world.inventory.AbstractFurnaceMenuAccessor;
+import org.spongepowered.common.accessor.world.inventory.AbstractMountInventoryMenuAccessor;
 import org.spongepowered.common.accessor.world.inventory.BeaconMenuAccessor;
 import org.spongepowered.common.accessor.world.inventory.BrewingStandMenuAccessor;
 import org.spongepowered.common.accessor.world.inventory.DispenserMenuAccessor;
 import org.spongepowered.common.accessor.world.inventory.HopperMenuAccessor;
-import org.spongepowered.common.accessor.world.inventory.HorseInventoryMenuAccessor;
 import org.spongepowered.common.accessor.world.inventory.ItemCombinerMenuAccessor;
 import org.spongepowered.common.accessor.world.inventory.MerchantMenuAccessor;
 import org.spongepowered.common.accessor.world.inventory.ResultSlotAccessor;
@@ -291,8 +291,8 @@ private static Lens generateAdapterLens(final SlotLensProvider slots, final int
             return ContainerUtil.carrierOrNull(((BrewingStandMenuAccessor) container).accessor$brewingStand());
         } else if (container instanceof BeaconMenu) {
             return new SpongeBlockEntityCarrier(((BeaconMenuAccessor) container).accessor$access().evaluate(Level::getBlockEntity).orElse(null), container);
-        } else if (container instanceof HorseInventoryMenuAccessor) {
-            return (Carrier) ((HorseInventoryMenuAccessor) container).accessor$horse();
+        } else if (container instanceof AbstractMountInventoryMenuAccessor) {
+            return (Carrier) ((AbstractMountInventoryMenuAccessor) container).accessor$mount();
         } else if (container instanceof MerchantMenuAccessor && ((MerchantMenuAccessor) container).accessor$trader() instanceof Carrier) {
             return (Carrier) ((MerchantMenuAccessor) container).accessor$trader();
         } else if (container instanceof ItemCombinerMenuAccessor) {

src/main/java/org/spongepowered/common/inventory/util/ContainerUtil.java

@@ -24,18 +24,25 @@
  */
 package org.spongepowered.common.mixin.api.minecraft.world.entity.animal.nautilus;
 
+import net.minecraft.world.SimpleContainer;
 import net.minecraft.world.entity.animal.nautilus.AbstractNautilus;
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.data.value.Value;
 import org.spongepowered.api.entity.living.animal.NautilusLike;
+import org.spongepowered.api.item.inventory.Carrier;
+import org.spongepowered.api.item.inventory.type.CarriedInventory;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.common.inventory.util.InventoryUtil;
 import org.spongepowered.common.mixin.api.minecraft.world.entity.TamableAnimalMixin_API;
 
 import java.util.Set;
 
 @Mixin(AbstractNautilus.class)
 public abstract class AbstractNautilusMixin_API extends TamableAnimalMixin_API implements NautilusLike {
 
+    @Shadow protected SimpleContainer inventory;
+
     @Override
     protected Set<Value.Immutable<?>> api$getVanillaValues() {
         final Set<Value.Immutable<?>> values = super.api$getVanillaValues();
@@ -47,4 +54,10 @@ public abstract class AbstractNautilusMixin_API extends TamableAnimalMixin_API i
 
         return values;
     }
+
+
+    @Override
+    public CarriedInventory<? extends Carrier> inventory() {
+        return InventoryUtil.carriedWrapperInventory(this.inventory, this);
+    }
 }

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/entity/animal/nautilus/AbstractNautilusMixin_API.java

@@ -140,7 +140,7 @@ public abstract class PlayerMixin_Attack extends LivingEntityMixin_Damage implem
     }
 
     @Inject(method = "attack",
-        at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;makeSound(Lnet/minecraft/sounds/SoundEvent;)V"), slice = @Slice(
+        at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;playServerSideSound(Lnet/minecraft/sounds/SoundEvent;)V"), slice = @Slice(
         from = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;isSprinting()Z", ordinal = 0),
         to = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/Item;getAttackDamageBonus(Lnet/minecraft/world/entity/Entity;FLnet/minecraft/world/damagesource/DamageSource;)F")))
     private void attack$captureStrongSprint(final Entity target, final CallbackInfo ci) {

src/mixins/java/org/spongepowered/common/mixin/core/world/entity/player/PlayerMixin_Attack.java

@@ -29,7 +29,7 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Cancellable;
 import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.game.ClientboundHorseScreenOpenPacket;
+import net.minecraft.network.protocol.game.ClientboundMountScreenOpenPacket;
 import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -226,7 +226,7 @@ public abstract class ServerPlayerMixin_Inventory extends PlayerMixin_Inventory
             ci.cancel();
             return menu;
         }
-        this.connection.send(new ClientboundHorseScreenOpenPacket(menu.containerId, $$4, $$3.getId()));
+        this.connection.send(new ClientboundMountScreenOpenPacket(menu.containerId, $$4, $$3.getId()));
         return menu;
     }
 

src/mixins/java/org/spongepowered/common/mixin/inventory/event/server/level/ServerPlayerMixin_Inventory.java

@@ -27,14 +27,14 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.AbstractFurnaceMenu;
+import net.minecraft.world.inventory.AbstractMountInventoryMenu;
 import net.minecraft.world.inventory.BeaconMenu;
 import net.minecraft.world.inventory.BrewingStandMenu;
 import net.minecraft.world.inventory.ChestMenu;
 import net.minecraft.world.inventory.CraftingMenu;
 import net.minecraft.world.inventory.DispenserMenu;
 import net.minecraft.world.inventory.EnchantmentMenu;
 import net.minecraft.world.inventory.HopperMenu;
-import net.minecraft.world.inventory.HorseInventoryMenu;
 import net.minecraft.world.inventory.InventoryMenu;
 import net.minecraft.world.inventory.ItemCombinerMenu;
 import net.minecraft.world.inventory.MenuType;
@@ -60,7 +60,7 @@
         ItemCombinerMenu.class,
         BrewingStandMenu.class,
         BeaconMenu.class,
-        HorseInventoryMenu.class,
+        AbstractMountInventoryMenu.class,
         MerchantMenu.class,
         InventoryMenu.class,
         CraftingMenu.class