From 398a3fb0bc3d5701dc0fed6c954f65c5fced9a70 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sun, 11 Aug 2024 09:55:12 -0500 Subject: [PATCH] Add alex's cave warning message --- coreSubProjects | 2 +- .../seibel/distanthorizons/forge/ForgeMain.java | 16 ++++++++++++++++ .../distanthorizons/neoforge/NeoforgeMain.java | 16 ++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 8d78a1ad7..dac51a9ee 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 8d78a1ad742bef69db57e7fb52227c596ff11af4 +Subproject commit dac51a9eea0b2d78b8c320996ec9b40fb307370d diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java index 3a853f08e..edd257828 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java @@ -22,6 +22,8 @@ package com.seibel.distanthorizons.forge; import com.mojang.brigadier.CommandDispatcher; import com.seibel.distanthorizons.common.AbstractModInitializer; import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen; +import com.seibel.distanthorizons.core.api.internal.ClientApi; +import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker; import com.seibel.distanthorizons.coreapi.ModInfo; @@ -104,6 +106,20 @@ public class ForgeMain extends AbstractModInitializer ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> GetConfigScreen.getScreen(parent))); #endif + + + if (Config.Client.Advanced.Logging.showModCompatibilityWarningsOnStartup.get()) + { + IModChecker modChecker = SingletonInjector.INSTANCE.get(IModChecker.class); + if (modChecker.isModLoaded("alexscaves")) + { + String message = + // orange text + "\u00A76" + "Distant Horizons: Alex's Cave detected." + "\u00A7r\n" + + "You may have to change Alex's config for DH to render. "; + ClientApi.INSTANCE.showChatMessageNextFrame(message); + } + } } @Override diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java index 8dd61f085..3cbebf3b4 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java @@ -22,6 +22,8 @@ package com.seibel.distanthorizons.neoforge; import com.mojang.brigadier.CommandDispatcher; import com.seibel.distanthorizons.common.AbstractModInitializer; import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen; +import com.seibel.distanthorizons.core.api.internal.ClientApi; +import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker; import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAccessor; @@ -83,6 +85,20 @@ public class NeoforgeMain extends AbstractModInitializer // TODO fix potential null pointer () -> (client, parent) -> GetConfigScreen.getScreen(parent)); #endif + + + if (Config.Client.Advanced.Logging.showModCompatibilityWarningsOnStartup.get()) + { + IModChecker modChecker = SingletonInjector.INSTANCE.get(IModChecker.class); + if (modChecker.isModLoaded("alexscaves")) + { + String message = + // orange text + "\u00A76" + "Distant Horizons: Alex's Cave detected." + "\u00A7r\n" + + "You may have to change Alex's config for DH to render. "; + ClientApi.INSTANCE.showChatMessageNextFrame(message); + } + } } @Override