From 7f4a335c97575092a2253f15f3024372137e0aa2 Mon Sep 17 00:00:00 2001 From: intricate Date: Mon, 28 Feb 2022 15:45:44 -0300 Subject: [PATCH] Fix #1350 (#1351) --- .../AbstractMinecart_scarpetEventsMixin.java | 28 +++++++++++++++++++ .../mixins/EndCrystal_scarpetEventsMixin.java | 28 +++++++++++++++++++ .../HangingEntity_scarpetEventsMixin.java | 28 +++++++++++++++++++ .../mixins/PrimedTnt_scarpetEventsMixin.java | 28 +++++++++++++++++++ src/main/resources/carpet.mixins.json | 4 +++ 5 files changed, 116 insertions(+) create mode 100644 src/main/java/carpet/mixins/AbstractMinecart_scarpetEventsMixin.java create mode 100644 src/main/java/carpet/mixins/EndCrystal_scarpetEventsMixin.java create mode 100644 src/main/java/carpet/mixins/HangingEntity_scarpetEventsMixin.java create mode 100644 src/main/java/carpet/mixins/PrimedTnt_scarpetEventsMixin.java diff --git a/src/main/java/carpet/mixins/AbstractMinecart_scarpetEventsMixin.java b/src/main/java/carpet/mixins/AbstractMinecart_scarpetEventsMixin.java new file mode 100644 index 00000000..dd9a16b4 --- /dev/null +++ b/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); + } +} \ No newline at end of file diff --git a/src/main/java/carpet/mixins/EndCrystal_scarpetEventsMixin.java b/src/main/java/carpet/mixins/EndCrystal_scarpetEventsMixin.java new file mode 100644 index 00000000..d7d261a4 --- /dev/null +++ b/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); + } +} \ No newline at end of file diff --git a/src/main/java/carpet/mixins/HangingEntity_scarpetEventsMixin.java b/src/main/java/carpet/mixins/HangingEntity_scarpetEventsMixin.java new file mode 100644 index 00000000..981770f3 --- /dev/null +++ b/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); + } +} \ No newline at end of file diff --git a/src/main/java/carpet/mixins/PrimedTnt_scarpetEventsMixin.java b/src/main/java/carpet/mixins/PrimedTnt_scarpetEventsMixin.java new file mode 100644 index 00000000..591f8d9f --- /dev/null +++ b/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); + } +} \ No newline at end of file diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json index 7554f063..77201504 100644 --- a/src/main/resources/carpet.mixins.json +++ b/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",