Skip to content

Commit 4b450bd

Browse files
committed
Add workaround for Forge eventbus limitation
1 parent e52554f commit 4b450bd

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

spark-common/src/test/java/me/lucko/spark/common/monitor/cpu/CpuInfoTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import org.junit.jupiter.api.Test;
2424

25-
import static org.junit.jupiter.api.Assertions.assertFalse;
2625
import static org.junit.jupiter.api.Assertions.assertNotNull;
2726

2827
public class CpuInfoTest {

spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeClientSparkPlugin.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import net.minecraft.commands.CommandSourceStack;
4242
import net.minecraftforge.client.ClientCommandHandler;
4343
import net.minecraftforge.client.event.RegisterClientCommandsEvent;
44-
import net.minecraftforge.event.TickEvent;
44+
import net.minecraftforge.client.event.RegisterClientReloadListenersEvent;
4545
import net.minecraftforge.eventbus.api.bus.BusGroup;
4646
import net.minecraftforge.eventbus.api.listener.EventListener;
4747
import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
@@ -90,10 +90,16 @@ public void disable() {
9090
}
9191

9292
@SubscribeEvent
93-
public void onCommandRegister(RegisterClientCommandsEvent e) {
93+
public void onRegisterClientCommands(RegisterClientCommandsEvent e) {
9494
registerCommands(e.getDispatcher(), this, this, "sparkc", "sparkclient");
9595
}
9696

97+
// not used - workaround for the idiotic Forge limitation that requires listeners using the @SubscribeEvent annotation to have at least two listener methods
98+
@SubscribeEvent
99+
public void onRegisterClientReloadListeners(RegisterClientReloadListenersEvent event) {
100+
101+
}
102+
97103
@Override
98104
public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
99105
String[] args = processArgs(context, false, "sparkc", "sparkclient");

spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeServerSparkPlugin.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import net.minecraft.server.MinecraftServer;
4848
import net.minecraft.server.level.ServerPlayer;
4949
import net.minecraftforge.event.RegisterCommandsEvent;
50-
import net.minecraftforge.event.TickEvent;
5150
import net.minecraftforge.event.server.ServerAboutToStartEvent;
5251
import net.minecraftforge.event.server.ServerStoppingEvent;
5352
import net.minecraftforge.eventbus.api.bus.BusGroup;

0 commit comments

Comments
 (0)