Fix #1 , again

RuiXuqi · RuiXuqi · commit edfcf9749d4c · 2026-02-23T14:14:34.000+08:00
diff --git a/gradle.properties b/gradle.properties
@@ -18,7 +18,7 @@ show_testing_output = false
 
 # Mod Information
 # HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
-mod_version = 1.0.2
+mod_version = 1.0.3
 root_package = com.clear
 mod_id = clearmybackground
 mod_name = Clear My Background
diff --git a/src/main/java/com/clear/clearmybackground/ClearMyBackground.java b/src/main/java/com/clear/clearmybackground/ClearMyBackground.java
@@ -16,10 +16,12 @@
 )
 public class ClearMyBackground {
     public static final Logger LOGGER = LogManager.getLogger();
-    public static boolean FluxLoadingLoaded = false;
+    public static boolean GAME_LOADING_DONE = false;
+    public static boolean FLUX_LOADING_LOADED = false;
 
     @Mod.EventHandler
     public void postInit(FMLPostInitializationEvent event) {
-        FluxLoadingLoaded = Loader.isModLoaded("fluxloading");
+        GAME_LOADING_DONE = true;
+        FLUX_LOADING_LOADED = Loader.isModLoaded("fluxloading");
     }
 }
diff --git a/src/main/java/com/clear/clearmybackground/ClientHelper.java b/src/main/java/com/clear/clearmybackground/ClientHelper.java
@@ -3,14 +3,14 @@
 import com.clear.clearmybackground.mixin.early.GuiMainMenuAccessor;
 import com.clear.clearmybackground.mixininterface.IGuiMainMenuMixin;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.GuiMainMenu;
-import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.gui.*;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.fml.client.GuiNotification;
 import org.lwjgl.opengl.GL11;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class ClientHelper {
 
@@ -45,11 +45,13 @@ public static void scissor(int screenX, int screenY, int boxWidth, int boxHeight
     private static final ResourceLocation INWORLD_HEADER_SEPARATOR = new ResourceLocation(Tags.MOD_ID, "textures/gui/inworld_header_separator.png");
     private static final ResourceLocation INWORLD_FOOTER_SEPARATOR = new ResourceLocation(Tags.MOD_ID, "textures/gui/inworld_footer_separator.png");
 
-    public static void renderWorldBackground(@Nonnull Minecraft mc, int width, int height) {
+    public static boolean renderWorldBackground(@Nullable GuiScreen screen, @Nonnull Minecraft mc, int width, int height) {
+        if (!shouldModifyBG(screen)) return false;
         if (mc.world == null) {
             renderPanorama(mc);
         }
         renderMenuBackground(mc, width, height);
+        return true;
     }
 
     private static void renderMenuBackground(@Nonnull Minecraft mc, int width, int height) {
@@ -114,4 +116,14 @@ public static void renderListBackground(@Nonnull Minecraft mc, int left, int top
         if (blend) GlStateManager.enableBlend();
         else GlStateManager.disableBlend();
     }
+
+    private static boolean shouldModifyBG(@Nullable GuiScreen screen) {
+        if (!ClearMyBackground.GAME_LOADING_DONE || screen == null) return false;
+        if (ClearMyBackground.FLUX_LOADING_LOADED &&
+                (screen instanceof GuiScreenWorking || screen instanceof GuiDownloadTerrain)
+        ) return false;
+        //noinspection RedundantIfStatement
+        if (screen instanceof GuiNotification) return false;
+        return true;
+    }
 }
diff --git a/src/main/java/com/clear/clearmybackground/mixin/early/GuiClickableScrolledSelectionListProxyMixin.java b/src/main/java/com/clear/clearmybackground/mixin/early/GuiClickableScrolledSelectionListProxyMixin.java
@@ -11,13 +11,13 @@
 @Mixin(GuiClickableScrolledSelectionListProxy.class)
 public class GuiClickableScrolledSelectionListProxyMixin {
     @Inject(method = "drawSelectionBox", at = @At("HEAD"))
-    private void enableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci){
+    private void enableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci) {
         GuiClickableScrolledSelectionListProxy self = (GuiClickableScrolledSelectionListProxy) (Object) this;
         ClientHelper.scissor(self.left, self.top, self.right - self.left, self.bottom - self.top);
     }
 
     @Inject(method = "drawSelectionBox", at = @At("RETURN"))
-    private void disableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci){
+    private void disableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci) {
         GL11.glDisable(GL11.GL_SCISSOR_TEST);
     }
 }
diff --git a/src/main/java/com/clear/clearmybackground/mixin/early/GuiScreenMixin.java b/src/main/java/com/clear/clearmybackground/mixin/early/GuiScreenMixin.java
@@ -1,12 +1,8 @@
 package com.clear.clearmybackground.mixin.early;
 
-import com.clear.clearmybackground.ClearMyBackground;
 import com.clear.clearmybackground.ClientHelper;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiDownloadTerrain;
 import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.GuiScreenWorking;
-import net.minecraftforge.fml.client.GuiOldSaveLoadConfirm;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -29,18 +25,16 @@ public class GuiScreenMixin {
     @Inject(method = "drawWorldBackground", at = @At("HEAD"), cancellable = true)
     public void drawWorldBackground(int tint, @Nonnull CallbackInfo ci) {
         GuiScreen self = (GuiScreen) (Object) this;
-        if (ClearMyBackground.FluxLoadingLoaded && (self instanceof GuiScreenWorking || self instanceof GuiDownloadTerrain)) return;
-        if (self instanceof GuiOldSaveLoadConfirm) return;
-        ClientHelper.renderWorldBackground(this.mc,this.width, this.height);
-        ci.cancel();
+        if (ClientHelper.renderWorldBackground(self, this.mc, this.width, this.height)) {
+            ci.cancel();
+        }
     }
 
     @Inject(method = "drawBackground", at = @At("HEAD"), cancellable = true)
     public void drawBackground(int tint, @Nonnull CallbackInfo ci) {
         GuiScreen self = (GuiScreen) (Object) this;
-        if (ClearMyBackground.FluxLoadingLoaded && (self instanceof GuiScreenWorking || self instanceof GuiDownloadTerrain)) return;
-        if (self instanceof GuiOldSaveLoadConfirm) return;
-        ClientHelper.renderWorldBackground(this.mc,this.width, this.height);
-        ci.cancel();
+        if (ClientHelper.renderWorldBackground(self, this.mc, this.width, this.height)) {
+            ci.cancel();
+        }
     }
 }
diff --git a/src/main/java/com/clear/clearmybackground/mixin/early/GuiSlotMixin.java b/src/main/java/com/clear/clearmybackground/mixin/early/GuiSlotMixin.java
@@ -101,12 +101,12 @@ private void modifyBackground(@Nonnull CallbackInfo ci) {
     }
 
     @Inject(method = "drawSelectionBox", at = @At("HEAD"))
-    private void enableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci){
+    private void enableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci) {
         ClientHelper.scissor(this.left, this.top, this.right - this.left, this.bottom - this.top);
     }
 
     @Inject(method = "drawSelectionBox", at = @At("RETURN"))
-    private void disableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci){
+    private void disableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci) {
         GL11.glDisable(GL11.GL_SCISSOR_TEST);
     }
 }
diff --git a/src/main/java/com/clear/clearmybackground/mixin/early/GuiWorldSelectionMixin.java b/src/main/java/com/clear/clearmybackground/mixin/early/GuiWorldSelectionMixin.java
@@ -12,6 +12,6 @@ public class GuiWorldSelectionMixin {
     @Inject(method = "drawScreen", at = @At("HEAD"))
     private void drawBG(int mouseX, int mouseY, float partialTicks, CallbackInfo ci) {
         GuiWorldSelection self = (GuiWorldSelection) (Object) this;
-        ClientHelper.renderWorldBackground(self.mc, self.width, self.height);
+        ClientHelper.renderWorldBackground(self, self.mc, self.width, self.height);
     }
 }
diff --git a/src/main/java/com/clear/clearmybackground/mixin/late/controlling/GuiNewKeyBindingListMixin.java b/src/main/java/com/clear/clearmybackground/mixin/late/controlling/GuiNewKeyBindingListMixin.java
@@ -11,13 +11,13 @@
 @Mixin(value = GuiNewKeyBindingList.class, remap = false)
 public class GuiNewKeyBindingListMixin {
     @Inject(method = "drawSelectionBox", at = @At("HEAD"))
-    private void enableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci){
+    private void enableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci) {
         GuiNewKeyBindingList self = (GuiNewKeyBindingList) (Object) this;
         ClientHelper.scissor(self.left, self.top, self.right - self.left, self.bottom - self.top);
     }
 
     @Inject(method = "drawSelectionBox", at = @At("RETURN"))
-    private void disableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci){
+    private void disableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci) {
         GL11.glDisable(GL11.GL_SCISSOR_TEST);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,12 @@`
`16`	`16`	`)`
`17`	`17`	`public class ClearMyBackground {`
`18`	`18`	`public static final Logger LOGGER = LogManager.getLogger();`
`19`		`- public static boolean FluxLoadingLoaded = false;`
	`19`	`+ public static boolean GAME_LOADING_DONE = false;`
	`20`	`+ public static boolean FLUX_LOADING_LOADED = false;`
`20`	`21`
`21`	`22`	`@Mod.EventHandler`
`22`	`23`	`public void postInit(FMLPostInitializationEvent event) {`
`23`		`- FluxLoadingLoaded = Loader.isModLoaded("fluxloading");`
	`24`	`+ GAME_LOADING_DONE = true;`
	`25`	`+ FLUX_LOADING_LOADED = Loader.isModLoaded("fluxloading");`
`24`	`26`	`}`
`25`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,13 @@`
`11`	`11`	`@Mixin(GuiClickableScrolledSelectionListProxy.class)`
`12`	`12`	`public class GuiClickableScrolledSelectionListProxyMixin {`
`13`	`13`	`@Inject(method = "drawSelectionBox", at = @At("HEAD"))`
`14`		`- private void enableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci){`
	`14`	`+ private void enableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci) {`
`15`	`15`	`GuiClickableScrolledSelectionListProxy self = (GuiClickableScrolledSelectionListProxy) (Object) this;`
`16`	`16`	`ClientHelper.scissor(self.left, self.top, self.right - self.left, self.bottom - self.top);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`@Inject(method = "drawSelectionBox", at = @At("RETURN"))`
`20`		`- private void disableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci){`
	`20`	`+ private void disableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci) {`
`21`	`21`	`GL11.glDisable(GL11.GL_SCISSOR_TEST);`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,12 +101,12 @@ private void modifyBackground(@Nonnull CallbackInfo ci) {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`@Inject(method = "drawSelectionBox", at = @At("HEAD"))`
`104`		`- private void enableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci){`
	`104`	`+ private void enableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci) {`
`105`	`105`	`ClientHelper.scissor(this.left, this.top, this.right - this.left, this.bottom - this.top);`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`@Inject(method = "drawSelectionBox", at = @At("RETURN"))`
`109`		`- private void disableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci){`
	`109`	`+ private void disableScissor(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks, CallbackInfo ci) {`
`110`	`110`	`GL11.glDisable(GL11.GL_SCISSOR_TEST);`
`111`	`111`	`}`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ public class GuiWorldSelectionMixin {`
`12`	`12`	`@Inject(method = "drawScreen", at = @At("HEAD"))`
`13`	`13`	`private void drawBG(int mouseX, int mouseY, float partialTicks, CallbackInfo ci) {`
`14`	`14`	`GuiWorldSelection self = (GuiWorldSelection) (Object) this;`
`15`		`- ClientHelper.renderWorldBackground(self.mc, self.width, self.height);`
	`15`	`+ ClientHelper.renderWorldBackground(self, self.mc, self.width, self.height);`
`16`	`16`	`}`
`17`	`17`	`}`