From 86e603e648226ccf13e6f0c1d24f27bb24b83481 Mon Sep 17 00:00:00 2001 From: object-Object Date: Tue, 20 Aug 2024 19:17:58 -0400 Subject: [PATCH] Remove unnecessary MixinClipContext mixin (see comments of #719) --- .../hexcasting/mixin/MixinClipContext.java | 20 ------------------- Common/src/main/resources/hexplat.mixins.json | 1 - 2 files changed, 21 deletions(-) delete mode 100644 Common/src/main/java/at/petrak/hexcasting/mixin/MixinClipContext.java diff --git a/Common/src/main/java/at/petrak/hexcasting/mixin/MixinClipContext.java b/Common/src/main/java/at/petrak/hexcasting/mixin/MixinClipContext.java deleted file mode 100644 index 22dadc7c9d..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/mixin/MixinClipContext.java +++ /dev/null @@ -1,20 +0,0 @@ -package at.petrak.hexcasting.mixin; - -import net.minecraft.world.entity.Entity; -import net.minecraft.world.level.ClipContext; -import net.minecraft.world.phys.shapes.CollisionContext; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(ClipContext.class) -public class MixinClipContext { - @Redirect(method = "", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/phys/shapes/CollisionContext;of(Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/phys/shapes/CollisionContext;")) - private CollisionContext allowNullEntity(Entity entity) { - if (entity == null) { - return CollisionContext.empty(); - } else { - return CollisionContext.of(entity); - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/hexplat.mixins.json b/Common/src/main/resources/hexplat.mixins.json index 3619793359..1d2ac13000 100644 --- a/Common/src/main/resources/hexplat.mixins.json +++ b/Common/src/main/resources/hexplat.mixins.json @@ -6,7 +6,6 @@ "package": "at.petrak.hexcasting.mixin", "mixins": [ "MixinAbstractVillager", - "MixinClipContext", "MixinMob", "MixinRaider", "MixinVillager",