Fix forge overlay

dima-dencep · Jan 16, 2024 · 56ba1eb · 56ba1eb
1 parent 91d7cf9
commit 56ba1eb
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/common/src/main/java/com/github/dimadencep/mods/rrls/accessor/SplashAccessor.java b/common/src/main/java/com/github/dimadencep/mods/rrls/accessor/SplashAccessor.java
@@ -41,7 +41,7 @@ public interface SplashAccessor {
         if (!ConfigExpectPlatform.hideType().canHide(reloading))
             return AttachType.DEFAULT;
 
-        if (reloading ||ConfigExpectPlatform.forceClose())
+        if (reloading || ConfigExpectPlatform.forceClose())
             return AttachType.HIDE;
 
         if (screen instanceof MessageScreen msg) // Loading Minecraft

diff --git a/common/src/main/java/com/github/dimadencep/mods/rrls/mixins/SplashOverlayMixin.java b/common/src/main/java/com/github/dimadencep/mods/rrls/mixins/SplashOverlayMixin.java
@@ -157,7 +157,8 @@ public abstract class SplashOverlayMixin extends Overlay {
             cancellable = true
     )
     public void rrls$render(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        this.rrls$attach = rrls$filterAttachType(client.currentScreen, this.rrls$attach != AttachType.WAIT);
+        if (rrls$attach != AttachType.DEFAULT)
+            this.rrls$attach = rrls$filterAttachType(client.currentScreen, this.rrls$attach != AttachType.WAIT);
 
         if (this.rrls$attach == AttachType.HIDE) {
             ci.cancel();

diff --git a/forge/src/main/java/com/github/dimadencep/mods/rrls/forge/RrlsForge.java b/forge/src/main/java/com/github/dimadencep/mods/rrls/forge/RrlsForge.java
@@ -12,7 +12,6 @@
 
 import com.github.dimadencep.mods.rrls.Rrls;
 import com.github.dimadencep.mods.rrls.accessor.SplashAccessor;
-import net.neoforged.fml.ModContainer;
 import net.neoforged.neoforge.client.event.RenderGuiEvent;
 import net.neoforged.neoforge.client.event.ScreenEvent;
 import net.neoforged.neoforge.common.NeoForge;
@@ -22,7 +21,7 @@
 
 @Mod("rrls")
 public class RrlsForge extends Rrls {
-    public RrlsForge(ModContainer modContainer) {
+    public RrlsForge() {
         NeoForge.EVENT_BUS.register(this);
     }
 

diff --git a/.../src/main/java/com/github/dimadencep/mods/rrls/forge/mixins/ForgeLoadingOverlayMixin.java b/.../src/main/java/com/github/dimadencep/mods/rrls/forge/mixins/ForgeLoadingOverlayMixin.java
@@ -68,7 +68,7 @@ public ForgeLoadingOverlayMixin(MinecraftClient client, ResourceReload monitor,
             cancellable = true
     )
     public void rrls$render(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        rrls$setAttachType(rrls$filterAttachType(minecraft.currentScreen, rrls$getAttachType() != AttachType.WAIT));
+        rrls$setAttachType(rrls$filterAttachType(minecraft.currentScreen, false)); // Forge loading overlay is loading overlay :)
 
         if (rrls$getAttachType() == SplashAccessor.AttachType.HIDE) {
             ci.cancel();

diff --git a/forge/src/main/java/com/github/dimadencep/mods/rrls/neoforge/ConfigExpectPlatformImpl.java b/forge/src/main/java/com/github/dimadencep/mods/rrls/neoforge/ConfigExpectPlatformImpl.java
@@ -93,11 +93,19 @@ public ConfigExpectPlatformImpl(ModConfigSpec.Builder builder) {
 
     static { // Early loading for config
         ModContainer activeContainer = ModList.get().getModContainerById(Rrls.MOD_ID).orElseThrow();
+        ModConfigSpec configSpec = ConfigExpectPlatformImpl.CONFIG_SPEC_PAIR.getValue();
 
-        ModConfig modConfig = new ModConfig(ModConfig.Type.CLIENT, ConfigExpectPlatformImpl.CONFIG_SPEC_PAIR.getValue(), activeContainer, "rrls.toml");
-        modConfig.getSpec().acceptConfig(ConfigFileTypeHandler.TOML.reader(FMLPaths.CONFIGDIR.get()).apply(modConfig));
-
+        ModConfig modConfig = new ModConfig(ModConfig.Type.CLIENT, configSpec, activeContainer, "rrls.toml");
         activeContainer.addConfig(modConfig);
+
+        if (!configSpec.isLoaded()) {
+            Rrls.LOGGER.warn("Config is not loaded?");
+
+            configSpec.acceptConfig(
+                    ConfigFileTypeHandler.TOML.reader(FMLPaths.CONFIGDIR.get())
+                            .apply(modConfig)
+            );
+        }
     }
 
     public static HideType hideType() {