Fix #1350 (#1351)

src/main/java/carpet/mixins/AbstractMinecart_scarpetEventsMixin.java

@@ -0,0 +1,28 @@
+package carpet.mixins;
+
+import carpet.fakes.EntityInterface;
+import carpet.script.EntityEventsGroup;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.vehicle.AbstractMinecart;
+import net.minecraft.world.level.Level;
+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;
+
+@Mixin(AbstractMinecart.class)
+public abstract class AbstractMinecart_scarpetEventsMixin extends Entity
+{
+    public AbstractMinecart_scarpetEventsMixin(EntityType<?> type, Level world)
+    {
+        super(type, world);
+    }
+
+    @Inject(method = "tick", at = @At("HEAD"))
+    private void onTickCall(CallbackInfo ci)
+    {
+        // calling extra on_tick because falling blocks do not fall back to super tick call
+        ((EntityInterface)this).getEventContainer().onEvent(EntityEventsGroup.Event.ON_TICK);
+    }
+}

src/main/java/carpet/mixins/EndCrystal_scarpetEventsMixin.java

@@ -0,0 +1,28 @@
+package carpet.mixins;
+
+import carpet.fakes.EntityInterface;
+import carpet.script.EntityEventsGroup;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.boss.enderdragon.EndCrystal;
+import net.minecraft.world.level.Level;
+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;
+
+@Mixin(EndCrystal.class)
+public abstract class EndCrystal_scarpetEventsMixin extends Entity
+{
+    public EndCrystal_scarpetEventsMixin(EntityType<?> type, Level world)
+    {
+        super(type, world);
+    }
+
+    @Inject(method = "tick", at = @At("HEAD"))
+    private void onTickCall(CallbackInfo ci)
+    {
+        // calling extra on_tick because falling blocks do not fall back to super tick call
+        ((EntityInterface)this).getEventContainer().onEvent(EntityEventsGroup.Event.ON_TICK);
+    }
+}

src/main/java/carpet/mixins/HangingEntity_scarpetEventsMixin.java

@@ -0,0 +1,28 @@
+package carpet.mixins;
+
+import carpet.fakes.EntityInterface;
+import carpet.script.EntityEventsGroup;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.decoration.HangingEntity;
+import net.minecraft.world.level.Level;
+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;
+
+@Mixin(HangingEntity.class)
+public abstract class HangingEntity_scarpetEventsMixin extends Entity
+{
+    public HangingEntity_scarpetEventsMixin(EntityType<?> type, Level world)
+    {
+        super(type, world);
+    }
+
+    @Inject(method = "tick", at = @At("HEAD"))
+    private void onTickCall(CallbackInfo ci)
+    {
+        // calling extra on_tick because falling blocks do not fall back to super tick call
+        ((EntityInterface)this).getEventContainer().onEvent(EntityEventsGroup.Event.ON_TICK);
+    }
+}

src/main/java/carpet/mixins/PrimedTnt_scarpetEventsMixin.java

@@ -0,0 +1,28 @@
+package carpet.mixins;
+
+import carpet.fakes.EntityInterface;
+import carpet.script.EntityEventsGroup;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.item.PrimedTnt;
+import net.minecraft.world.level.Level;
+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;
+
+@Mixin(PrimedTnt.class)
+public abstract class PrimedTnt_scarpetEventsMixin extends Entity
+{
+    public PrimedTnt_scarpetEventsMixin(EntityType<?> type, Level world)
+    {
+        super(type, world);
+    }
+
+    @Inject(method = "tick", at = @At("HEAD"))
+    private void onTickCall(CallbackInfo ci)
+    {
+        // calling extra on_tick because falling blocks do not fall back to super tick call
+        ((EntityInterface)this).getEventContainer().onEvent(EntityEventsGroup.Event.ON_TICK);
+    }
+}

src/main/resources/carpet.mixins.json

@@ -147,7 +147,11 @@
     "LivingEntity_scarpetEventsMixin",
     "Player_scarpetEventsMixin",
     "ServerPlayer_scarpetEventMixin",
+    "AbstractMinecart_scarpetEventsMixin",
+    "EndCrystal_scarpetEventsMixin",
     "FallingBlockEntity_scarpetEventsMixin",
+    "HangingEntity_scarpetEventsMixin",
+    "PrimedTnt_scarpetEventsMixin",
     "BlockItem_scarpetEventMixin",
     "PlayerList_scarpetEventsMixin",
     "Inventory_scarpetEventMixin",