From 0e086d91a69087e491302bb7a4264fd3393ab716 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 20 May 2019 10:06:10 +0200 Subject: [PATCH] Use own event distribution system instead abusing fabric's one --- jGui | 2 +- .../core/events/KeyBindingEventCallback.java | 8 +++----- .../replaymod/core/events/KeyEventCallback.java | 8 +++----- .../core/events/PostRenderCallback.java | 8 +++----- .../core/events/PostRenderWorldCallback.java | 8 +++----- .../core/events/PreRenderCallback.java | 8 +++----- .../core/events/PreRenderHandCallback.java | 8 +++----- .../core/events/SettingsChangedCallback.java | 8 +++----- .../extras/playeroverview/PlayerOverview.java | 9 +++------ .../com/replaymod/online/ReplayModOnline.java | 6 ++++-- .../replaymod/pathing/player/ReplayTimer.java | 10 +++++----- .../com/replaymod/render/ReplayModRender.java | 7 +++++-- .../render/events/ReplayRenderCallback.java | 11 +++++------ .../render/hooks/FogStateCallback.java | 11 +++++------ .../render/hooks/Texture2DStateCallback.java | 11 +++++------ .../replaymod/replay/camera/CameraEntity.java | 4 ++-- .../RenderSpectatorCrosshairCallback.java | 17 +++++++---------- .../replay/events/ReplayClosedCallback.java | 7 +++---- .../replay/events/ReplayClosingCallback.java | 7 +++---- .../replay/events/ReplayOpenedCallback.java | 7 +++---- .../replaymod/replay/mixin/MixinInGameHud.java | 7 +++---- versions/common.gradle | 4 ---- 22 files changed, 75 insertions(+), 101 deletions(-) diff --git a/jGui b/jGui index e0af8663..caea250b 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit e0af866315fa9b25b822497c8b045c5782b87949 +Subproject commit caea250b67f0fc71fd5add3791215964c043f3cb diff --git a/src/main/java/com/replaymod/core/events/KeyBindingEventCallback.java b/src/main/java/com/replaymod/core/events/KeyBindingEventCallback.java index fef27d8c..e2b9cffc 100644 --- a/src/main/java/com/replaymod/core/events/KeyBindingEventCallback.java +++ b/src/main/java/com/replaymod/core/events/KeyBindingEventCallback.java @@ -1,13 +1,11 @@ //#if MC>=11300 package com.replaymod.core.events; -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; +import de.johni0702.minecraft.gui.utils.Event; public interface KeyBindingEventCallback { - Event EVENT = EventFactory.createArrayBacked( - KeyBindingEventCallback.class, - (listeners) -> () -> { + Event EVENT = Event.create((listeners) -> + () -> { for (KeyBindingEventCallback listener : listeners) { listener.onKeybindingEvent(); } diff --git a/src/main/java/com/replaymod/core/events/KeyEventCallback.java b/src/main/java/com/replaymod/core/events/KeyEventCallback.java index 6ed28864..a9567295 100644 --- a/src/main/java/com/replaymod/core/events/KeyEventCallback.java +++ b/src/main/java/com/replaymod/core/events/KeyEventCallback.java @@ -1,13 +1,11 @@ //#if MC>=11300 package com.replaymod.core.events; -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; +import de.johni0702.minecraft.gui.utils.Event; public interface KeyEventCallback { - Event EVENT = EventFactory.createArrayBacked( - KeyEventCallback.class, - (listeners) -> (key, scanCode, action, modifiers) -> { + Event EVENT = Event.create((listeners) -> + (key, scanCode, action, modifiers) -> { for (KeyEventCallback listener : listeners) { listener.onKeyEvent(key, scanCode, action, modifiers); } diff --git a/src/main/java/com/replaymod/core/events/PostRenderCallback.java b/src/main/java/com/replaymod/core/events/PostRenderCallback.java index 3e7d6a13..4f228317 100644 --- a/src/main/java/com/replaymod/core/events/PostRenderCallback.java +++ b/src/main/java/com/replaymod/core/events/PostRenderCallback.java @@ -1,13 +1,11 @@ //#if MC>=11300 package com.replaymod.core.events; -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; +import de.johni0702.minecraft.gui.utils.Event; public interface PostRenderCallback { - Event EVENT = EventFactory.createArrayBacked( - PostRenderCallback.class, - (listeners) -> () -> { + Event EVENT = Event.create((listeners) -> + () -> { for (PostRenderCallback listener : listeners) { listener.postRender(); } diff --git a/src/main/java/com/replaymod/core/events/PostRenderWorldCallback.java b/src/main/java/com/replaymod/core/events/PostRenderWorldCallback.java index efca6c98..4f5f5502 100644 --- a/src/main/java/com/replaymod/core/events/PostRenderWorldCallback.java +++ b/src/main/java/com/replaymod/core/events/PostRenderWorldCallback.java @@ -1,13 +1,11 @@ //#if MC>=11400 package com.replaymod.core.events; -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; +import de.johni0702.minecraft.gui.utils.Event; public interface PostRenderWorldCallback { - Event EVENT = EventFactory.createArrayBacked( - PostRenderWorldCallback.class, - (listeners) -> () -> { + Event EVENT = Event.create((listeners) -> + () -> { for (PostRenderWorldCallback listener : listeners) { listener.postRenderWorld(); } diff --git a/src/main/java/com/replaymod/core/events/PreRenderCallback.java b/src/main/java/com/replaymod/core/events/PreRenderCallback.java index f8e8fa53..6f9eb82f 100644 --- a/src/main/java/com/replaymod/core/events/PreRenderCallback.java +++ b/src/main/java/com/replaymod/core/events/PreRenderCallback.java @@ -1,13 +1,11 @@ //#if MC>=11300 package com.replaymod.core.events; -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; +import de.johni0702.minecraft.gui.utils.Event; public interface PreRenderCallback { - Event EVENT = EventFactory.createArrayBacked( - PreRenderCallback.class, - (listeners) -> () -> { + Event EVENT = Event.create((listeners) -> + () -> { for (PreRenderCallback listener : listeners) { listener.preRender(); } diff --git a/src/main/java/com/replaymod/core/events/PreRenderHandCallback.java b/src/main/java/com/replaymod/core/events/PreRenderHandCallback.java index 57434a92..8aed026c 100644 --- a/src/main/java/com/replaymod/core/events/PreRenderHandCallback.java +++ b/src/main/java/com/replaymod/core/events/PreRenderHandCallback.java @@ -1,13 +1,11 @@ //#if MC>=11300 package com.replaymod.core.events; -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; +import de.johni0702.minecraft.gui.utils.Event; public interface PreRenderHandCallback { - Event EVENT = EventFactory.createArrayBacked( - PreRenderHandCallback.class, - (listeners) -> () -> { + Event EVENT = Event.create((listeners) -> + () -> { for (PreRenderHandCallback listener : listeners) { if (listener.preRenderHand()) { return true; diff --git a/src/main/java/com/replaymod/core/events/SettingsChangedCallback.java b/src/main/java/com/replaymod/core/events/SettingsChangedCallback.java index d4bc5edc..2fc680a8 100644 --- a/src/main/java/com/replaymod/core/events/SettingsChangedCallback.java +++ b/src/main/java/com/replaymod/core/events/SettingsChangedCallback.java @@ -1,13 +1,11 @@ package com.replaymod.core.events; import com.replaymod.core.SettingsRegistry; -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; +import de.johni0702.minecraft.gui.utils.Event; public interface SettingsChangedCallback { - Event EVENT = EventFactory.createArrayBacked( - SettingsChangedCallback.class, - (listeners) -> (registry, key) -> { + Event EVENT = Event.create((listeners) -> + (registry, key) -> { for (SettingsChangedCallback listener : listeners) { listener.onSettingsChanged(registry, key); } diff --git a/src/main/java/com/replaymod/extras/playeroverview/PlayerOverview.java b/src/main/java/com/replaymod/extras/playeroverview/PlayerOverview.java index 6c81a021..a499457c 100644 --- a/src/main/java/com/replaymod/extras/playeroverview/PlayerOverview.java +++ b/src/main/java/com/replaymod/extras/playeroverview/PlayerOverview.java @@ -95,12 +95,7 @@ public class PlayerOverview extends EventRegistrations implements Extra { } }); - ReplayOpenedCallback.EVENT.register(this::onReplayOpen); - ReplayClosedCallback.EVENT.register(this::onReplayClose); - //#if MC>=11400 - //#else - //$$ FORGE_BUS.register(this); - //#endif + register(); } public boolean isHidden(UUID uuid) { @@ -115,6 +110,7 @@ public class PlayerOverview extends EventRegistrations implements Extra { } } + { on(ReplayOpenedCallback.EVENT, this::onReplayOpen); } private void onReplayOpen(ReplayHandler replayHandler) throws IOException { Optional> savedData = replayHandler.getReplayFile().getInvisiblePlayers(); if (savedData.isPresent()) { @@ -125,6 +121,7 @@ public class PlayerOverview extends EventRegistrations implements Extra { } } + { on(ReplayClosedCallback.EVENT, this::onReplayClose); } private void onReplayClose(ReplayHandler replayHandler) { hiddenPlayers.clear(); } diff --git a/src/main/java/com/replaymod/online/ReplayModOnline.java b/src/main/java/com/replaymod/online/ReplayModOnline.java index 16e4104f..d431f131 100644 --- a/src/main/java/com/replaymod/online/ReplayModOnline.java +++ b/src/main/java/com/replaymod/online/ReplayModOnline.java @@ -15,6 +15,7 @@ import com.replaymod.replaystudio.replay.ReplayFile; import com.replaymod.replaystudio.replay.ZipReplayFile; import com.replaymod.replaystudio.studio.ReplayStudio; import de.johni0702.minecraft.gui.container.GuiScreen; +import de.johni0702.minecraft.gui.utils.EventRegistrations; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -29,7 +30,7 @@ import java.nio.file.Path; import static com.replaymod.core.versions.MCVer.*; -public class ReplayModOnline implements Module { +public class ReplayModOnline extends EventRegistrations implements Module { { instance = this; } public static ReplayModOnline instance; @@ -80,7 +81,7 @@ public class ReplayModOnline implements Module { } new GuiHandler(this).register(); - ReplayClosedCallback.EVENT.register(replayHandler -> onReplayClosed()); + register(); // Initial login prompt if (!core.getSettingsRegistry().get(Setting.SKIP_LOGIN_PROMPT)) { @@ -164,6 +165,7 @@ public class ReplayModOnline implements Module { } } + { on(ReplayClosedCallback.EVENT, replayHandler -> onReplayClosed()); } private void onReplayClosed() { if (currentReplayOutputFile != null) { if (currentReplayOutputFile.exists()) { // Replay was modified, ask user for new name diff --git a/src/main/java/com/replaymod/pathing/player/ReplayTimer.java b/src/main/java/com/replaymod/pathing/player/ReplayTimer.java index cbf73778..1290f0ca 100644 --- a/src/main/java/com/replaymod/pathing/player/ReplayTimer.java +++ b/src/main/java/com/replaymod/pathing/player/ReplayTimer.java @@ -1,8 +1,7 @@ package com.replaymod.pathing.player; import com.replaymod.core.utils.WrappedTimer; -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; +import de.johni0702.minecraft.gui.utils.Event; import net.minecraft.client.render.RenderTickCounter; /** @@ -45,12 +44,13 @@ public class ReplayTimer extends WrappedTimer { } public interface UpdatedCallback { - Event EVENT = EventFactory.createArrayBacked(UpdatedCallback.class, - (listeners) -> () -> { + Event EVENT = Event.create((listeners) -> + () -> { for (UpdatedCallback listener : listeners) { listener.onUpdate(); } - }); + } + ); void onUpdate(); } } diff --git a/src/main/java/com/replaymod/render/ReplayModRender.java b/src/main/java/com/replaymod/render/ReplayModRender.java index f99b5f69..5c5c46ce 100644 --- a/src/main/java/com/replaymod/render/ReplayModRender.java +++ b/src/main/java/com/replaymod/render/ReplayModRender.java @@ -4,6 +4,7 @@ import com.replaymod.core.Module; import com.replaymod.core.ReplayMod; import com.replaymod.render.utils.RenderJob; import com.replaymod.replay.events.ReplayClosedCallback; +import de.johni0702.minecraft.gui.utils.EventRegistrations; import net.minecraft.util.crash.CrashReport; import net.minecraft.util.crash.CrashException; import org.apache.commons.io.FileUtils; @@ -18,7 +19,7 @@ import java.util.List; import static com.replaymod.core.versions.MCVer.*; -public class ReplayModRender implements Module { +public class ReplayModRender extends EventRegistrations implements Module { { instance = this; } public static ReplayModRender instance; @@ -40,7 +41,9 @@ public class ReplayModRender implements Module { @Override public void initClient() { - ReplayClosedCallback.EVENT.register(replayHandler -> renderQueue.clear()); + on(ReplayClosedCallback.EVENT, replayHandler -> renderQueue.clear()); + + register(); } public File getVideoFolder() { diff --git a/src/main/java/com/replaymod/render/events/ReplayRenderCallback.java b/src/main/java/com/replaymod/render/events/ReplayRenderCallback.java index 6230d365..c2bfe362 100644 --- a/src/main/java/com/replaymod/render/events/ReplayRenderCallback.java +++ b/src/main/java/com/replaymod/render/events/ReplayRenderCallback.java @@ -1,13 +1,12 @@ package com.replaymod.render.events; import com.replaymod.render.rendering.VideoRenderer; -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; +import de.johni0702.minecraft.gui.utils.Event; public interface ReplayRenderCallback { interface Pre { - Event
 EVENT = EventFactory.createArrayBacked(Pre.class,
-                (listeners) -> (renderer) -> {
+        Event
 EVENT = Event.create((listeners) ->
+                (renderer) -> {
                     for (Pre listener : listeners) {
                         listener.beforeRendering(renderer);
                     }
@@ -17,8 +16,8 @@ public interface ReplayRenderCallback {
     }
 
     interface Post {
-        Event EVENT = EventFactory.createArrayBacked(Post.class,
-                (listeners) -> (renderer) -> {
+        Event EVENT = Event.create((listeners) ->
+                (renderer) -> {
                     for (Post listener : listeners) {
                         listener.afterRendering(renderer);
                     }
diff --git a/src/main/java/com/replaymod/render/hooks/FogStateCallback.java b/src/main/java/com/replaymod/render/hooks/FogStateCallback.java
index bda8cd1e..1a8ad4e2 100644
--- a/src/main/java/com/replaymod/render/hooks/FogStateCallback.java
+++ b/src/main/java/com/replaymod/render/hooks/FogStateCallback.java
@@ -1,16 +1,15 @@
 package com.replaymod.render.hooks;
 
-import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.fabric.api.event.EventFactory;
+import de.johni0702.minecraft.gui.utils.Event;
 
 public interface FogStateCallback {
-    Event EVENT = EventFactory.createArrayBacked(FogStateCallback.class,
-            (enabled) -> {},
-            (listeners) -> (enabled) -> {
+    Event EVENT = Event.create((listeners) ->
+            (enabled) -> {
                 for (FogStateCallback listener : listeners) {
                     listener.fogStateChanged(enabled);
                 }
-            });
+            }
+    );
 
     void fogStateChanged(boolean enabled);
 }
diff --git a/src/main/java/com/replaymod/render/hooks/Texture2DStateCallback.java b/src/main/java/com/replaymod/render/hooks/Texture2DStateCallback.java
index 04878007..1a063697 100644
--- a/src/main/java/com/replaymod/render/hooks/Texture2DStateCallback.java
+++ b/src/main/java/com/replaymod/render/hooks/Texture2DStateCallback.java
@@ -1,16 +1,15 @@
 package com.replaymod.render.hooks;
 
-import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.fabric.api.event.EventFactory;
+import de.johni0702.minecraft.gui.utils.Event;
 
 public interface Texture2DStateCallback {
-    Event EVENT = EventFactory.createArrayBacked(Texture2DStateCallback.class,
-            (slot, enabled) -> {},
-            (listeners) -> (slot, enabled) -> {
+    Event EVENT = Event.create((listeners) ->
+            (slot, enabled) -> {
                 for (Texture2DStateCallback listener : listeners) {
                     listener.texture2DStateChanged(slot, enabled);
                 }
-            });
+            }
+    );
 
     void texture2DStateChanged(int slot, boolean enabled);
 }
diff --git a/src/main/java/com/replaymod/replay/camera/CameraEntity.java b/src/main/java/com/replaymod/replay/camera/CameraEntity.java
index a8f49420..dbd21bd9 100755
--- a/src/main/java/com/replaymod/replay/camera/CameraEntity.java
+++ b/src/main/java/com/replaymod/replay/camera/CameraEntity.java
@@ -639,8 +639,8 @@ public class CameraEntity
 
         //#if MC>=11400
         { on(RenderSpectatorCrosshairCallback.EVENT, this::shouldRenderSpectatorCrosshair); }
-        private TriState shouldRenderSpectatorCrosshair() {
-            return TriState.of(canSpectate(mc.targetedEntity));
+        private Boolean shouldRenderSpectatorCrosshair() {
+            return canSpectate(mc.targetedEntity);
         }
         //#else
         //$$ @SubscribeEvent
diff --git a/src/main/java/com/replaymod/replay/events/RenderSpectatorCrosshairCallback.java b/src/main/java/com/replaymod/replay/events/RenderSpectatorCrosshairCallback.java
index 1630e180..fd2af1a3 100644
--- a/src/main/java/com/replaymod/replay/events/RenderSpectatorCrosshairCallback.java
+++ b/src/main/java/com/replaymod/replay/events/RenderSpectatorCrosshairCallback.java
@@ -1,24 +1,21 @@
 //#if MC>=11300
 package com.replaymod.replay.events;
 
-import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.fabric.api.event.EventFactory;
-import net.fabricmc.fabric.api.util.TriState;
+import de.johni0702.minecraft.gui.utils.Event;
 
 public interface RenderSpectatorCrosshairCallback {
-    Event EVENT = EventFactory.createArrayBacked(
-            RenderSpectatorCrosshairCallback.class,
-            (listeners) -> () -> {
+    Event EVENT = Event.create((listeners) ->
+            () -> {
                 for (RenderSpectatorCrosshairCallback listener : listeners) {
-                    TriState state = listener.shouldRenderSpectatorCrosshair();
-                    if (state != TriState.DEFAULT) {
+                    Boolean state = listener.shouldRenderSpectatorCrosshair();
+                    if (state != null) {
                         return state;
                     }
                 }
-                return TriState.DEFAULT;
+                return null;
             }
     );
 
-    TriState shouldRenderSpectatorCrosshair();
+    Boolean shouldRenderSpectatorCrosshair();
 }
 //#endif
diff --git a/src/main/java/com/replaymod/replay/events/ReplayClosedCallback.java b/src/main/java/com/replaymod/replay/events/ReplayClosedCallback.java
index b0f2cf45..cf3e6a5d 100644
--- a/src/main/java/com/replaymod/replay/events/ReplayClosedCallback.java
+++ b/src/main/java/com/replaymod/replay/events/ReplayClosedCallback.java
@@ -1,12 +1,11 @@
 package com.replaymod.replay.events;
 
 import com.replaymod.replay.ReplayHandler;
-import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.fabric.api.event.EventFactory;
+import de.johni0702.minecraft.gui.utils.Event;
 
 public interface ReplayClosedCallback {
-    Event EVENT = EventFactory.createArrayBacked(ReplayClosedCallback.class,
-            (listeners) -> (replayHandler) -> {
+    Event EVENT = Event.create((listeners) ->
+            (replayHandler) -> {
                 for (ReplayClosedCallback listener : listeners) {
                     listener.replayClosed(replayHandler);
                 }
diff --git a/src/main/java/com/replaymod/replay/events/ReplayClosingCallback.java b/src/main/java/com/replaymod/replay/events/ReplayClosingCallback.java
index 14c46e90..9392f536 100644
--- a/src/main/java/com/replaymod/replay/events/ReplayClosingCallback.java
+++ b/src/main/java/com/replaymod/replay/events/ReplayClosingCallback.java
@@ -1,14 +1,13 @@
 package com.replaymod.replay.events;
 
 import com.replaymod.replay.ReplayHandler;
-import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.fabric.api.event.EventFactory;
+import de.johni0702.minecraft.gui.utils.Event;
 
 import java.io.IOException;
 
 public interface ReplayClosingCallback {
-    Event EVENT = EventFactory.createArrayBacked(ReplayClosingCallback.class,
-            (listeners) -> (replayHandler) -> {
+    Event EVENT = Event.create((listeners) ->
+            (replayHandler) -> {
                 for (ReplayClosingCallback listener : listeners) {
                     listener.replayClosing(replayHandler);
                 }
diff --git a/src/main/java/com/replaymod/replay/events/ReplayOpenedCallback.java b/src/main/java/com/replaymod/replay/events/ReplayOpenedCallback.java
index 3dc7685e..9bd27238 100644
--- a/src/main/java/com/replaymod/replay/events/ReplayOpenedCallback.java
+++ b/src/main/java/com/replaymod/replay/events/ReplayOpenedCallback.java
@@ -1,14 +1,13 @@
 package com.replaymod.replay.events;
 
 import com.replaymod.replay.ReplayHandler;
-import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.fabric.api.event.EventFactory;
+import de.johni0702.minecraft.gui.utils.Event;
 
 import java.io.IOException;
 
 public interface ReplayOpenedCallback {
-    Event EVENT = EventFactory.createArrayBacked(ReplayOpenedCallback.class,
-            (listeners) -> (replayHandler) -> {
+    Event EVENT = Event.create((listeners) ->
+            (replayHandler) -> {
                 for (ReplayOpenedCallback listener : listeners) {
                     listener.replayOpened(replayHandler);
                 }
diff --git a/src/main/java/com/replaymod/replay/mixin/MixinInGameHud.java b/src/main/java/com/replaymod/replay/mixin/MixinInGameHud.java
index 7d12ca4d..82f720a8 100644
--- a/src/main/java/com/replaymod/replay/mixin/MixinInGameHud.java
+++ b/src/main/java/com/replaymod/replay/mixin/MixinInGameHud.java
@@ -2,7 +2,6 @@
 package com.replaymod.replay.mixin;
 
 import com.replaymod.replay.events.RenderSpectatorCrosshairCallback;
-import net.fabricmc.fabric.api.util.TriState;
 import net.minecraft.client.gui.hud.InGameHud;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -13,9 +12,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 public class MixinInGameHud {
     @Inject(method = "shouldRenderSpectatorCrosshair", at = @At("HEAD"), cancellable = true)
     private void shouldRenderSpectatorCrosshair(CallbackInfoReturnable ci) {
-        TriState state = RenderSpectatorCrosshairCallback.EVENT.invoker().shouldRenderSpectatorCrosshair();
-        if (state != TriState.DEFAULT) {
-            ci.setReturnValue(state.get());
+        Boolean state = RenderSpectatorCrosshairCallback.EVENT.invoker().shouldRenderSpectatorCrosshair();
+        if (state != null) {
+            ci.setReturnValue(state);
         }
     }
 }
diff --git a/versions/common.gradle b/versions/common.gradle
index b42feb47..1d82f89b 100644
--- a/versions/common.gradle
+++ b/versions/common.gradle
@@ -220,10 +220,6 @@ dependencies {
         modCompile 'net.fabricmc:fabric:' + [
                 11400: '0.2.7+build.127'
         ][mcVersion]
-    } else {
-        shadow('net.fabricmc.fabric-api:fabric-lib:0.1.0') { // for Event, EventFactory, etc.
-            transitive = false
-        }
     }
 
     if (FG3) {