chore: update to 1.21.4-pre1

- fixes CreakingData - fixes unleashing injection point for the event
SpongePowered · Nov 22, 2024 · 837b428 · 837b428
1 parent 87d0ae6
commit 837b428
Show file tree

Hide file tree

Showing 9 changed files with 428 additions and 76 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,7 @@ mixinConfigs=mixins.sponge.accessors.json,mixins.sponge.api.json,mixins.sponge.c
   mixins.sponge.tracker.json,mixins.sponge.ipforward.json,mixins.sponge.optimization.json
 superClassChanges=common.superclasschange
 
-minecraftVersion=24w46a
+minecraftVersion=1.21.4-pre1
 recommendedVersion=0-SNAPSHOT
 
 org.gradle.dependency.verification.console=verbose

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
diff --git a/...ava/org/spongepowered/common/accessor/world/entity/monster/creaking/CreakingAccessor.java b/...ava/org/spongepowered/common/accessor/world/entity/monster/creaking/CreakingAccessor.java
diff --git a/src/accessors/resources/mixins.sponge.accessors.json b/src/accessors/resources/mixins.sponge.accessors.json
@@ -107,7 +107,6 @@
         "world.entity.monster.VexAccessor",
         "world.entity.monster.VindicatorAccessor",
         "world.entity.monster.ZombifiedPiglinAccessor",
-      "world.entity.monster.creaking.CreakingAccessor",
         "world.entity.npc.AbstractVillagerAccessor",
         "world.entity.player.AbilitiesAccessor",
         "world.entity.player.PlayerAccessor",

diff --git a/src/main/java/org/spongepowered/common/data/provider/entity/CreakingData.java b/src/main/java/org/spongepowered/common/data/provider/entity/CreakingData.java
@@ -26,7 +26,6 @@
 
 import net.minecraft.world.entity.monster.creaking.Creaking;
 import org.spongepowered.api.data.Keys;
-import org.spongepowered.common.accessor.world.entity.monster.creaking.CreakingAccessor;
 import org.spongepowered.common.data.provider.DataProviderRegistrator;
 import org.spongepowered.common.util.VecHelper;
 
@@ -37,11 +36,11 @@ public static void register(final DataProviderRegistrator registrator) {
         registrator
             .asImmutable(Creaking.class)
             .create(Keys.CREAKING_IS_LINKED)
-            .get(Creaking::isTransient);
+            .get(Creaking::isHeartBound);
         registrator
             .asMutable(Creaking.class)
             .create(Keys.CREAKING_HOME_POSITION)
-            .get(h -> VecHelper.toVector3i(((CreakingAccessor) h).accessor$homePos()))
+            .get(h -> VecHelper.toVector3i(h.getHomePos()))
             .set((h, v) -> h.setTransient(VecHelper.toBlockPos(v)));
         ;
     }

diff --git a/src/main/java/org/spongepowered/common/data/provider/entity/LeashableData.java b/src/main/java/org/spongepowered/common/data/provider/entity/LeashableData.java
@@ -42,13 +42,11 @@ public static void register(final DataProviderRegistrator registrator) {
                 final var ld = h.getLeashData();
                 return ld == null ? null : (Entity) ld.leashHolder;
             })
-            .delete(h -> {
-                h.dropLeash(true, false);
-            })
+            .delete(Leashable::dropLeash)
             .set((h, v) -> {
                 if (v == null) {
                     // TODO remove
-                    h.dropLeash(true, false);
+                    h.dropLeash();
                 } else {
                     h.setLeashedTo((net.minecraft.world.entity.Entity) v, true);
                 }

diff --git a/src/main/java/org/spongepowered/common/data/provider/item/stack/SpawnEggItemStackData.java b/src/main/java/org/spongepowered/common/data/provider/item/stack/SpawnEggItemStackData.java
@@ -32,6 +32,7 @@
 import net.minecraft.world.item.component.CustomData;
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.entity.EntityArchetype;
+import org.spongepowered.common.SpongeCommon;
 import org.spongepowered.common.data.provider.DataProviderRegistrator;
 import org.spongepowered.common.entity.SpongeEntityArchetypeBuilder;
 
@@ -46,7 +47,7 @@ public static void register(final DataProviderRegistrator registrator) {
                     .get(stack -> {
                         final Item item = stack.getItem();
                         final SpawnEggItem eggItem = (SpawnEggItem) item;
-                        final EntityType<?> type = eggItem.getType(stack);
+                        final EntityType<?> type = eggItem.getType(SpongeCommon.vanillaRegistryAccess(), stack);
                         final var tag = stack.getOrDefault(DataComponents.ENTITY_DATA, CustomData.EMPTY).getUnsafe();
 
                         final EntityArchetype.Builder builder = EntityArchetype.builder().type((org.spongepowered.api.entity.EntityType<?>) type);
@@ -60,7 +61,7 @@ public static void register(final DataProviderRegistrator registrator) {
                     .get(stack -> {
                         final Item item = stack.getItem();
                         final SpawnEggItem eggItem = (SpawnEggItem) item;
-                        return (org.spongepowered.api.entity.EntityType) eggItem.getType(stack);
+                        return (org.spongepowered.api.entity.EntityType) eggItem.getType(SpongeCommon.vanillaRegistryAccess(), stack);
                     })
         ;
     }

diff --git a/src/mixins/java/org/spongepowered/common/mixin/core/world/entity/LeashableMixin.java b/src/mixins/java/org/spongepowered/common/mixin/core/world/entity/LeashableMixin.java
@@ -25,14 +25,22 @@
 package org.spongepowered.common.mixin.core.world.entity;
 
 import net.minecraft.world.entity.Leashable;
+import org.checkerframework.checker.units.qual.A;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.entity.Entity;
+import org.spongepowered.api.entity.living.Living;
 import org.spongepowered.api.event.Cause;
+import org.spongepowered.api.event.CauseStackManager;
 import org.spongepowered.api.event.SpongeEventFactory;
+import org.spongepowered.api.event.entity.UnleashEntityEvent;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.common.SpongeCommon;
+import org.spongepowered.common.event.tracking.PhaseTracker;
+
+import java.util.Objects;
 
 @Mixin(Leashable.class)
 public interface LeashableMixin {
@@ -47,4 +55,27 @@ public interface LeashableMixin {
         }
     }
 
+    @Inject(method = "dropLeash(Lnet/minecraft/world/entity/Entity;ZZ)V", at = @At("HEAD"), cancellable = true)
+    private static void impl$onDropLeash(final net.minecraft.world.entity.Entity entity, final boolean $$1, final boolean $$2, final CallbackInfo ci) {
+        if (entity == null || entity.level().isClientSide) {
+            return;
+        }
+
+        Leashable.LeashData leashData = ((Leashable) (Object) entity).getLeashData();
+        if (leashData == null) {
+            return;
+        }
+
+        final net.minecraft.world.entity.Entity holder = leashData.leashHolder;
+
+        final CauseStackManager csm = PhaseTracker.getCauseStackManager();
+        csm.pushCause(Objects.requireNonNullElse(holder, entity));
+        final UnleashEntityEvent event = SpongeEventFactory.createUnleashEntityEvent(csm.currentCause(), (Entity) entity);
+        SpongeCommon.post(event);
+        csm.popCause();
+        if (event.isCancelled()) {
+            ci.cancel();
+        }
+    }
+
 }
diff --git a/src/mixins/java/org/spongepowered/common/mixin/core/world/entity/MobMixin.java b/src/mixins/java/org/spongepowered/common/mixin/core/world/entity/MobMixin.java
@@ -86,34 +86,6 @@ public abstract class MobMixin extends LivingEntityMixin {
         }
     }
 
-    @Inject(method = "dropLeash", cancellable = true,
-        at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Leashable;dropLeash(ZZ)V"))
-    private void impl$ThrowUnleashEvent(final boolean sendPacket, final boolean dropLead, final CallbackInfo ci) {
-        if (this.shadow$level().isClientSide) {
-            return;
-        }
-
-        var leashData = this.shadow$getLeashData();
-        if (leashData == null) {
-            return;
-        }
-
-        final net.minecraft.world.entity.Entity entity = leashData.leashHolder;
-
-        final CauseStackManager csm = PhaseTracker.getCauseStackManager();
-        if (entity == null) {
-            csm.pushCause(this);
-        } else {
-            csm.pushCause(entity);
-        }
-        final UnleashEntityEvent event = SpongeEventFactory.createUnleashEntityEvent(csm.currentCause(), (Living) this);
-        SpongeCommon.post(event);
-        csm.popCause();
-        if (event.isCancelled()) {
-            ci.cancel();
-        }
-    }
-
     /**
      * @author gabizou - January 4th, 2016
      *