Get compat module compiling on 1.13

This commit is contained in:
Jonas Herzig
2019-04-24 18:07:46 +02:00
parent df6f744d51
commit 6f15df8081
16 changed files with 248 additions and 223 deletions

View File

@@ -2,6 +2,7 @@ package com.replaymod.core;
import com.google.common.io.Files;
import com.google.common.util.concurrent.ListenableFutureTask;
import com.replaymod.compat.ReplayModCompat;
import com.replaymod.core.gui.GuiBackgroundProcesses;
import com.replaymod.core.gui.GuiReplaySettings;
import com.replaymod.core.gui.RestoreReplayGui;
@@ -164,6 +165,7 @@ public class ReplayMod implements Module {
modules.add(new ReplayModSimplePathing(this));
modules.add(new ReplayModEditor(this));
modules.add(new ReplayModExtras(this));
modules.add(new ReplayModCompat());
//#if MC>=11300
settingsRegistry.register();
@@ -284,8 +286,9 @@ public class ReplayMod implements Module {
// 1.7.10 crashes when render distance > 16
//#if MC>=10800
//if(!FMLClientHandler.instance().hasOptifine()) FIXME 1.13 update
GameSettings.Options.RENDER_DISTANCE.setValueMax(64f);
if (!MCVer.hasOptifine()) {
GameSettings.Options.RENDER_DISTANCE.setValueMax(64f);
}
//#endif
testIfMoeshAndExitMinecraft();

View File

@@ -32,6 +32,7 @@ import org.lwjgl.glfw.GLFW;
//#else
//$$ import net.minecraft.client.gui.ScaledResolution;
//$$ import net.minecraft.client.resources.ResourcePackRepository;
//$$ import net.minecraftforge.fml.client.FMLClientHandler;
//$$ import org.apache.logging.log4j.LogManager;
//$$ import org.lwjgl.Sys;
//$$ import java.awt.Desktop;
@@ -494,6 +495,25 @@ public class MCVer {
//#endif
}
//#if MC>=11300
private static Boolean hasOptifine;
public static boolean hasOptifine() {
if (hasOptifine == null) {
try {
Class.forName("Config");
hasOptifine = true;
} catch (ClassNotFoundException e) {
hasOptifine = false;
}
}
return hasOptifine;
}
//#else
//$$ public static boolean hasOptifine() {
//$$ return FMLClientHandler.instance().hasOptifine();
//$$ }
//#endif
//#if MC<=10710
//$$ public static class GlStateManager {
//$$ public static void resetColor() { /* nop */ }