new pr because fixing merge conflict would take too long

2 files changed, 0 insertions, 56 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/events/ClientPlayerBlockBreakEvent.java b/src/main/java/me/xmrvizzy/skyblocker/events/ClientPlayerBlockBreakEvent.java
deleted file mode 100644
index 76298612..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/events/ClientPlayerBlockBreakEvent.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package me.xmrvizzy.skyblocker.events;
-
-import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.fabric.api.event.EventFactory;
-import net.minecraft.block.BlockState;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
-// Fabric API currently doesn't have an event for this
-public class ClientPlayerBlockBreakEvent {
-    public static final Event<AfterBlockBreak> AFTER = EventFactory.createArrayBacked(AfterBlockBreak.class,
-            (listeners) -> (world, player, pos, state) -> {
-                for (AfterBlockBreak listener : listeners) {
-                    listener.afterBlockBreak(world, player, pos, state);
-                }
-            });
-
-    @FunctionalInterface
-    public interface AfterBlockBreak {
-        void afterBlockBreak(World world, PlayerEntity player, BlockPos pos, BlockState state);
-    }
-}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/events/SkyblockEvents.java b/src/main/java/me/xmrvizzy/skyblocker/events/SkyblockEvents.java
deleted file mode 100644
index 477d68b0..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/events/SkyblockEvents.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package me.xmrvizzy.skyblocker.events;
-
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.fabric.api.event.EventFactory;
-
-@Environment(EnvType.CLIENT)
-public final class SkyblockEvents {
-    public static final Event<SkyblockEvents.SkyblockJoin> JOIN = EventFactory.createArrayBacked(SkyblockEvents.SkyblockJoin.class, callbacks -> () -> {
-        for (SkyblockEvents.SkyblockJoin callback : callbacks) {
-            callback.onSkyblockJoin();
-        }
-    });
-
-    public static final Event<SkyblockEvents.SkyblockLeave> LEAVE = EventFactory.createArrayBacked(SkyblockEvents.SkyblockLeave.class, callbacks -> () -> {
-        for (SkyblockEvents.SkyblockLeave callback : callbacks) {
-            callback.onSkyblockLeave();
-        }
-    });
-
-    @Environment(EnvType.CLIENT)
-    @FunctionalInterface
-    public interface SkyblockJoin {
-        void onSkyblockJoin();
-    }
-
-    @Environment(EnvType.CLIENT)
-    @FunctionalInterface
-    public interface SkyblockLeave {
-        void onSkyblockLeave();
-    }
-}