DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[1.8] Fix incorrect event bus for deferred runLater (fixes #206)

Browse Source
This commit is contained in:
Jonas Herzig
2020-06-28 18:11:27 +02:00
parent 058346d247
commit 72b44c368b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/replaymod/core/ReplayMod.java
View File

@@ -56,6 +56,7 @@ import net.fabricmc.loader.api.FabricLoader;
//$$ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; //$$ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
//$$ import net.minecraftforge.versions.mcp.MCPVersion; //$$ import net.minecraftforge.versions.mcp.MCPVersion;
//#else //#else
//$$ import static com.replaymod.core.versions.MCVer.FML_BUS;
//$$ import net.minecraft.client.resources.IResourcePack; //$$ import net.minecraft.client.resources.IResourcePack;
//$$ import net.minecraftforge.common.config.Configuration; //$$ import net.minecraftforge.common.config.Configuration;
//#endif //#endif
@@ -72,14 +73,12 @@ import net.fabricmc.loader.api.FabricLoader;
//$$ import net.minecraftforge.fml.common.Mod.Instance; //$$ import net.minecraftforge.fml.common.Mod.Instance;
//$$ import net.minecraftforge.fml.common.event.FMLInitializationEvent; //$$ import net.minecraftforge.fml.common.event.FMLInitializationEvent;
//$$ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; //$$ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
//$$ import static com.replaymod.core.versions.MCVer.FORGE_BUS;
//#if MC>=10800 //#if MC>=10800
//$$ import net.minecraftforge.fml.client.FMLClientHandler; //$$ import net.minecraftforge.fml.client.FMLClientHandler;
//#else //#else
//$$ import com.replaymod.replay.InputReplayTimer; //$$ import com.replaymod.replay.InputReplayTimer;
//$$ //$$
//$$ import java.util.ArrayDeque; //$$ import java.util.ArrayDeque;
//$$ import static com.replaymod.core.versions.MCVer.FML_BUS;
//#endif //#endif
//#endif //#endif
//$$ import net.minecraftforge.fml.common.Mod; //$$ import net.minecraftforge.fml.common.Mod;
@@ -548,11 +547,11 @@ public class ReplayMod implements
//#else //#else
//$$ if (mc.isCallingFromMinecraftThread() && inRunLater) { //$$ if (mc.isCallingFromMinecraftThread() && inRunLater) {
//#if MC>=10800 //#if MC>=10800
//$$ FORGE_BUS.register(new Object() { //$$ FML_BUS.register(new Object() {
//$$ @SubscribeEvent //$$ @SubscribeEvent
//$$ public void onRenderTick(TickEvent.RenderTickEvent event) { //$$ public void onRenderTick(TickEvent.RenderTickEvent event) {
//$$ if (event.phase == TickEvent.Phase.START) { //$$ if (event.phase == TickEvent.Phase.START) {
//$$ FORGE_BUS.unregister(this); //$$ FML_BUS.unregister(this);
//$$ defer.run(); //$$ defer.run();
//$$ } //$$ }
//$$ } //$$ }