From 72b44c368b6bfbd0d024395ce0a9703b0e4f856d Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sun, 28 Jun 2020 18:11:27 +0200 Subject: [PATCH] [1.8] Fix incorrect event bus for deferred runLater (fixes #206) --- src/main/java/com/replaymod/core/ReplayMod.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/replaymod/core/ReplayMod.java b/src/main/java/com/replaymod/core/ReplayMod.java index 5df90af0..5f3aed69 100644 --- a/src/main/java/com/replaymod/core/ReplayMod.java +++ b/src/main/java/com/replaymod/core/ReplayMod.java @@ -56,6 +56,7 @@ import net.fabricmc.loader.api.FabricLoader; //$$ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; //$$ import net.minecraftforge.versions.mcp.MCPVersion; //#else +//$$ import static com.replaymod.core.versions.MCVer.FML_BUS; //$$ import net.minecraft.client.resources.IResourcePack; //$$ import net.minecraftforge.common.config.Configuration; //#endif @@ -72,14 +73,12 @@ import net.fabricmc.loader.api.FabricLoader; //$$ import net.minecraftforge.fml.common.Mod.Instance; //$$ import net.minecraftforge.fml.common.event.FMLInitializationEvent; //$$ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -//$$ import static com.replaymod.core.versions.MCVer.FORGE_BUS; //#if MC>=10800 //$$ import net.minecraftforge.fml.client.FMLClientHandler; //#else //$$ import com.replaymod.replay.InputReplayTimer; //$$ //$$ import java.util.ArrayDeque; -//$$ import static com.replaymod.core.versions.MCVer.FML_BUS; //#endif //#endif //$$ import net.minecraftforge.fml.common.Mod; @@ -548,11 +547,11 @@ public class ReplayMod implements //#else //$$ if (mc.isCallingFromMinecraftThread() && inRunLater) { //#if MC>=10800 - //$$ FORGE_BUS.register(new Object() { + //$$ FML_BUS.register(new Object() { //$$ @SubscribeEvent //$$ public void onRenderTick(TickEvent.RenderTickEvent event) { //$$ if (event.phase == TickEvent.Phase.START) { - //$$ FORGE_BUS.unregister(this); + //$$ FML_BUS.unregister(this); //$$ defer.run(); //$$ } //$$ }