feat(minecraft): update to 26.1-snapshot-1

Lots of changes to RegistryLoader and Villager Trades

See: https://minecraft.wiki/w/Java_Edition_26.1_Snapshot_1

Author: gabizou

gradle.properties

@@ -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=1.21.11
+minecraftVersion=26.1-snapshot-1
 recommendedVersion=0-SNAPSHOT
 
 org.gradle.dependency.verification.console=verbose

settings.gradle.kts

@@ -10,7 +10,7 @@ pluginManagement {
         }
     }
     plugins {
-        id("org.spongepowered.gradle.vanilla") version "0.2.2"
+        id("org.spongepowered.gradle.vanilla") version "0.3.0-SNAPSHOT"
         id("implementation-structure")
     }
 }

src/accessors/java/org/spongepowered/common/accessor/resources/RegistryDataLoader_LoaderAccessor.java

@@ -29,7 +29,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-@Mixin(targets = "net/minecraft/resources/RegistryDataLoader$Loader")
+@Mixin(RegistryDataLoader.RegistryLoadTask.class)
 public interface RegistryDataLoader_LoaderAccessor<T> {
 
     @Accessor("data") RegistryDataLoader.RegistryData<T> accessor$data();

src/accessors/java/org/spongepowered/common/accessor/resources/RegistryDataLoader_RegistryLoadTaskAccessor.java

@@ -0,0 +1,13 @@
+package org.spongepowered.common.accessor.resources;
+
+import net.minecraft.core.WritableRegistry;
+import net.minecraft.resources.RegistryDataLoader;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(RegistryDataLoader.RegistryLoadTask.class)
+public interface RegistryDataLoader_RegistryLoadTaskAccessor<E> {
+
+    @Accessor("registry") WritableRegistry<E> accessor$getRegistry();
+
+}

src/accessors/java/org/spongepowered/common/accessor/resources/RegistryDataLoader_ResourceManagerRegistryLoadTaskAccessor.java

@@ -0,0 +1,11 @@
+package org.spongepowered.common.accessor.resources;
+
+import net.minecraft.server.packs.resources.ResourceManager;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(targets = "net/minecraft/resources/RegistryDataLoader$ResourceManagerRegistryLoadTask")
+public interface RegistryDataLoader_ResourceManagerRegistryLoadTaskAccessor {
+
+    @Accessor("resourceManager") ResourceManager accessor$getResourceManager();
+}

src/accessors/java/org/spongepowered/common/accessor/util/BlockableEventLoopAccessor.java

@@ -0,0 +1,12 @@
+package org.spongepowered.common.accessor.util;
+
+import net.minecraft.util.thread.BlockableEventLoop;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(BlockableEventLoop.class)
+public interface BlockableEventLoopAccessor {
+
+    @Invoker("pollTask") boolean invoker$pollTask();
+
+}

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

@@ -17,8 +17,8 @@
     "commands.arguments.selector.options.EntitySelectorOptions_OptionAccessor",
     "commands.arguments.selector.options.EntitySelectorOptionsAccessor",
     "core.MappedRegistryAccessor",
-    "entity.animal.frog.FrogAccessor",
     "entity.animal.equine.AbstractChestedHorseEntityAccessor",
+    "entity.animal.frog.FrogAccessor",
     "entity.vehicle.minecart.AbstractMinecartAccessor",
     "network.ConnectionAccessor",
     "network.chat.StyleAccessor",
@@ -31,6 +31,8 @@
     "network.protocol.game.ServerboundMoveVehiclePacketAccessor",
     "network.protocol.handshake.ClientIntentionPacketAccessor",
     "resources.RegistryDataLoader_LoaderAccessor",
+    "resources.RegistryDataLoader_RegistryLoadTaskAccessor",
+    "resources.RegistryDataLoader_ResourceManagerRegistryLoadTaskAccessor",
     "resources.ResourceKeyAccessor",
     "server.MinecraftServer_ReloadableResourcesAccessor",
     "server.MinecraftServerAccessor",
@@ -54,6 +56,7 @@
     "sounds.SoundEventAccessor",
     "stats.StatsCounterAccessor",
     "tags.TagEntryAccessor",
+    "util.BlockableEventLoopAccessor",
     "util.datafix.schemas.V100Accessor",
     "world.CompoundContainerAccessor",
     "world.DamageSourcesAccessor",
@@ -75,23 +78,23 @@
     "world.entity.PortalProcessorAccessor",
     "world.entity.ai.targeting.TargetingConditionsAccessor",
     "world.entity.animal.AnimalAccessor",
-    "world.entity.animal.feline.CatAccessor",
-    "world.entity.animal.fox.FoxAccessor",
     "world.entity.animal.cow.MooshroomAccessor",
+    "world.entity.animal.equine.AbstractHorseAccessor",
+    "world.entity.animal.equine.HorseAccessor",
+    "world.entity.animal.equine.LlamaAccessor",
+    "world.entity.animal.equine.TraderLlamaAccessor",
+    "world.entity.animal.feline.CatAccessor",
     "world.entity.animal.feline.OcelotAccessor",
+    "world.entity.animal.fish.PufferfishAccessor",
+    "world.entity.animal.fish.TropicalFishAccessor",
+    "world.entity.animal.fox.FoxAccessor",
+    "world.entity.animal.frog.TadpoleAccessor",
     "world.entity.animal.panda.PandaAccessor",
     "world.entity.animal.parrot.ParrotAccessor",
     "world.entity.animal.pig.PigAccessor",
-    "world.entity.animal.fish.PufferfishAccessor",
     "world.entity.animal.rabbit.RabbitAccessor",
-    "world.entity.animal.fish.TropicalFishAccessor",
-    "world.entity.animal.turtle.TurtleAccessor",
-    "world.entity.animal.frog.TadpoleAccessor",
-    "world.entity.animal.equine.AbstractHorseAccessor",
-    "world.entity.animal.equine.HorseAccessor",
-    "world.entity.animal.equine.LlamaAccessor",
-    "world.entity.animal.equine.TraderLlamaAccessor",
     "world.entity.animal.sheep.SheepAccessor",
+    "world.entity.animal.turtle.TurtleAccessor",
     "world.entity.animal.wolf.WolfAccessor",
     "world.entity.boss.enderdragon.phases.EnderDragonPhaseAccessor",
     "world.entity.boss.wither.WitherBossAccessor",
@@ -105,26 +108,26 @@
     "world.entity.monster.CreeperAccessor",
     "world.entity.monster.EnderManAccessor",
     "world.entity.monster.EndermiteAccessor",
-    "world.entity.monster.illager.EvokerAccessor",
     "world.entity.monster.GuardianAccessor",
     "world.entity.monster.PatrollingMonsterAccessor",
     "world.entity.monster.PhantomAccessor",
-    "world.entity.monster.illager.PillagerAccessor",
     "world.entity.monster.RavagerAccessor",
     "world.entity.monster.SlimeAccessor",
-    "world.entity.monster.illager.SpellcasterIllagerAccessor",
     "world.entity.monster.VexAccessor",
+    "world.entity.monster.illager.EvokerAccessor",
+    "world.entity.monster.illager.PillagerAccessor",
+    "world.entity.monster.illager.SpellcasterIllagerAccessor",
     "world.entity.monster.illager.VindicatorAccessor",
     "world.entity.monster.zombie.ZombifiedPiglinAccessor",
     "world.entity.npc.villager.AbstractVillagerAccessor",
     "world.entity.player.AbilitiesAccessor",
     "world.entity.player.PlayerAccessor",
-    "world.entity.projectile.arrow.AbstractArrowAccessor",
-    "world.entity.projectile.arrow.ArrowAccessor",
     "world.entity.projectile.EyeOfEnderAccessor",
     "world.entity.projectile.FireworkRocketEntityAccessor",
     "world.entity.projectile.FishingHookAccessor",
     "world.entity.projectile.ShulkerBulletAccessor",
+    "world.entity.projectile.arrow.AbstractArrowAccessor",
+    "world.entity.projectile.arrow.ArrowAccessor",
     "world.entity.raid.RaidAccessor",
     "world.entity.raid.RaiderAccessor",
     "world.entity.raid.RaidsAccessor",
@@ -134,11 +137,11 @@
     "world.inventory.AbstractContainerMenuAccessor",
     "world.inventory.AbstractCraftingMenuAccessor",
     "world.inventory.AbstractFurnaceMenuAccessor",
+    "world.inventory.AbstractMountInventoryMenuAccessor",
     "world.inventory.BeaconMenuAccessor",
     "world.inventory.BrewingStandMenuAccessor",
     "world.inventory.DispenserMenuAccessor",
     "world.inventory.HopperMenuAccessor",
-    "world.inventory.AbstractMountInventoryMenuAccessor",
     "world.inventory.ItemCombinerMenuAccessor",
     "world.inventory.MerchantMenuAccessor",
     "world.inventory.ResultSlotAccessor",

src/main/java/org/spongepowered/common/advancement/SpongeFilteredTrigger.java

@@ -27,7 +27,7 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import net.minecraft.advancements.CriterionTriggerInstance;
-import net.minecraft.advancements.criterion.CriterionValidator;
+import net.minecraft.world.level.storage.loot.ValidationContextSource;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.spongepowered.api.advancement.criteria.trigger.FilteredTrigger;
@@ -70,8 +70,7 @@ public JsonObject serializeToJson() {
     }
 
     @Override
-    public void validate(final CriterionValidator var1) {
+    public void validate(ValidationContextSource validator) {
 
     }
-
 }

src/main/java/org/spongepowered/common/adventure/SpongeAdventure.java

@@ -520,7 +520,7 @@ public static HoverEvent<?> asAdventure(final net.minecraft.network.chat.HoverEv
                 final var stack = si.item();
                 final Registry<Item> itemRegistry = SpongeCommon.vanillaRegistry(Registries.ITEM);
                 yield HoverEvent.showItem(
-                    SpongeAdventure.asAdventure(stack.getItemHolder().unwrap().map(ResourceKey::identifier, itemRegistry::getKey)),
+                    SpongeAdventure.asAdventure(stack.typeHolder().unwrap().map(ResourceKey::identifier, itemRegistry::getKey)),
                     stack.getCount(),
                     SpongeAdventure.asAdventure(stack.getComponentsPatch())
                 );