From 74b0ffa58689b627fadd8da6ce62686ed466799c Mon Sep 17 00:00:00 2001
From: WakelessSloth56 <wsloth56@foxmail.com>
Date: Wed, 28 Sep 2022 21:40:53 +0800
Subject: [PATCH] refactor(next): remove PistonCheckPushableEvent

---
 .../common/event/AHCommonEventFactory.java    |  8 -----
 .../event/impl/PistonCheckPushableEvent.java  | 24 --------------
 .../mixin/common/MixinPistonBaseBlock.java    | 31 -------------------
 src/main/resources/arnicalib.mixin.json       |  1 -
 4 files changed, 64 deletions(-)
 delete mode 100644 src/main/java/org/auioc/mcmod/arnicalib/common/event/impl/PistonCheckPushableEvent.java
 delete mode 100644 src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinPistonBaseBlock.java

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/common/event/AHCommonEventFactory.java b/src/main/java/org/auioc/mcmod/arnicalib/common/event/AHCommonEventFactory.java
index 463f3c9a..e3131211 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/common/event/AHCommonEventFactory.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/common/event/AHCommonEventFactory.java
@@ -1,13 +1,9 @@
 package org.auioc.mcmod.arnicalib.common.event;
 
 import org.auioc.mcmod.arnicalib.common.event.impl.ItemInventoryTickEvent;
-import org.auioc.mcmod.arnicalib.common.event.impl.PistonCheckPushableEvent;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.IEventBus;
 
@@ -15,10 +11,6 @@ public final class AHCommonEventFactory {
 
     private static final IEventBus BUS = MinecraftForge.EVENT_BUS;
 
-    public static boolean onPistonCheckPushable(BlockState blockState, Level level, BlockPos blockPos, Direction pushDirection, boolean p_60209_, Direction p_60210_) {
-        return BUS.post(new PistonCheckPushableEvent(blockState, level, blockPos, pushDirection, p_60209_, p_60210_));
-    }
-
     public static boolean onSelectedItemItemInventoryTick(Player player, Level level, ItemStack itemStack, int index) {
         return BUS.post(new ItemInventoryTickEvent.Selected(player, level, itemStack, index));
     }
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/common/event/impl/PistonCheckPushableEvent.java b/src/main/java/org/auioc/mcmod/arnicalib/common/event/impl/PistonCheckPushableEvent.java
deleted file mode 100644
index 1e2684d7..00000000
--- a/src/main/java/org/auioc/mcmod/arnicalib/common/event/impl/PistonCheckPushableEvent.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.auioc.mcmod.arnicalib.common.event.impl;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraftforge.event.world.BlockEvent;
-import net.minecraftforge.eventbus.api.Cancelable;
-
-@Cancelable
-public class PistonCheckPushableEvent extends BlockEvent {
-
-    private final Direction pushDirection;
-
-    public PistonCheckPushableEvent(BlockState blockState, Level level, BlockPos blockPos, Direction pushDirection, boolean p_185646_4_, Direction p_185646_5_) {
-        super(level, blockPos, blockState);
-        this.pushDirection = pushDirection;
-    }
-
-    public Direction getPushDirection() {
-        return pushDirection;
-    }
-
-}
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinPistonBaseBlock.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinPistonBaseBlock.java
deleted file mode 100644
index ac8e775f..00000000
--- a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinPistonBaseBlock.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.auioc.mcmod.arnicalib.mixin.common;
-
-import org.auioc.mcmod.arnicalib.common.event.AHCommonEventFactory;
-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.CallbackInfoReturnable;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.piston.PistonBaseBlock;
-import net.minecraft.world.level.block.state.BlockState;
-
-@Mixin(value = PistonBaseBlock.class)
-public abstract class MixinPistonBaseBlock {
-
-    // @org.spongepowered.asm.mixin.Debug(export = true, print = true)
-    @Inject(
-        method = "Lnet/minecraft/world/level/block/piston/PistonBaseBlock;isPushable(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;ZLnet/minecraft/core/Direction;)Z",
-        at = @At(value = "HEAD"),
-        require = 1,
-        allow = 1,
-        cancellable = true
-    )
-    private static void onCheckPushable(BlockState p_60205_, Level p_60206_, BlockPos p_60207_, Direction p_60208_, boolean p_60209_, Direction p_60210_, CallbackInfoReturnable<Boolean> cir) {
-        if (AHCommonEventFactory.onPistonCheckPushable(p_60205_, p_60206_, p_60207_, p_60208_, p_60209_, p_60210_)) {
-            cir.setReturnValue(false);
-        }
-    }
-
-}
diff --git a/src/main/resources/arnicalib.mixin.json b/src/main/resources/arnicalib.mixin.json
index b4720b14..8d66c0ff 100644
--- a/src/main/resources/arnicalib.mixin.json
+++ b/src/main/resources/arnicalib.mixin.json
@@ -3,7 +3,6 @@
     "package": "org.auioc.mcmod.arnicalib.mixin",
     "compatibilityLevel": "JAVA_17",
     "mixins": [
-        "common.MixinPistonBaseBlock",
         "common.MixinMobEffectInstance",
         "common.MixinCommandSourceStack",
         "common.MixinItemStack",