From b77acaa3b24a8d132f609ccc4411f6e76d17c391 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 15 Oct 2024 07:47:59 -0500 Subject: [PATCH] Fix javadoc compiling and some Mac lockup issues --- coreSubProjects | 2 +- .../java/com/seibel/distanthorizons/fabric/FabricMain.java | 6 ++---- gradle.properties | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/coreSubProjects b/coreSubProjects index 69a5fdc72..59767c807 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 69a5fdc720bdb9e16a87357cec2929b52719094d +Subproject commit 59767c807b1193c184aed7b82baf55337e6ad786 diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java index 1e76226cc..f0ba7543d 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java @@ -40,6 +40,7 @@ import net.minecraft.commands.CommandSourceStack; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; import org.apache.logging.log4j.Logger; +import org.lwjgl.util.tinyfd.TinyFileDialogs; #if MC_VER >= MC_1_19_2 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; @@ -95,10 +96,7 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti String indiumMissingMessage = ModInfo.READABLE_NAME + " needs Indium to work with Sodium.\nPlease download Indium from https://modrinth.com/mod/indium"; LOGGER.fatal(indiumMissingMessage); - if (!GraphicsEnvironment.isHeadless()) - { - JOptionPane.showMessageDialog(null, indiumMissingMessage, ModInfo.READABLE_NAME, JOptionPane.INFORMATION_MESSAGE); - } + TinyFileDialogs.tinyfd_messageBox(ModInfo.READABLE_NAME, indiumMissingMessage, "ok", "error", false); IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class); String errorMessage = "loading Distant Horizons. Distant Horizons requires Indium in order to run with Sodium."; diff --git a/gradle.properties b/gradle.properties index f87cc515e..da0053c21 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ mod_issues=https://gitlab.com/jeseibel/distant-horizons/-/issues mod_discord=https://discord.gg/xAB8G4cENx # Global Plugin Versions -manifold_version=2024.1.32 +manifold_version=2024.1.35 # 2023.1.17 can be used if there are mystery Java compiler issues nightconfig_version=3.6.6 lz4_version=1.8.0