(1.8.9) fix more custom sky-related bugs

Author: moehreag

1.8.9/src/main/java/io/github/axolotlclient/mixin/TextureManagerAccessor.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2025 moehreag <[email protected]> & Contributors
+ *
+ * This file is part of AxolotlClient.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * For more information, see the LICENSE file.
+ */
+
+package io.github.axolotlclient.mixin;
+
+import java.util.Map;
+
+import net.minecraft.client.render.texture.Texture;
+import net.minecraft.client.render.texture.TextureManager;
+import net.minecraft.resource.Identifier;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(TextureManager.class)
+public interface TextureManagerAccessor {
+
+	@Accessor("textures")
+	Map<Identifier, Texture> getTextures();
+}

1.8.9/src/main/java/io/github/axolotlclient/modules/sky/SkyResourceManager.java

@@ -53,7 +53,6 @@ public class SkyResourceManager extends AbstractModule {
 
 	public void reload(ResourceManager resourceManager) {
 		AxolotlClient.LOGGER.debug("Loading custom skies!");
-		SkyboxManager.getInstance().clearSkyboxes();
 		for (Identifier entry : resourceManager
 			.findResources("fabricskyboxes", "sky", identifier -> identifier.getPath().endsWith(".json"))
 			.keySet()) {
@@ -140,6 +139,7 @@ private void loadMCPSky(String loader, Identifier id, ResourceManager resourceMa
 
 	@Override
 	public void init() {
+		ResourceLoaderEvents.START_RESOURCE_RELOAD.register(() -> SkyboxManager.getInstance().clearSkyboxes());
 		ResourceLoaderEvents.END_RESOURCE_RELOAD.register(() -> reload(Minecraft.getInstance().getResourceManager()));
 	}
 }

1.8.9/src/main/java/io/github/axolotlclient/modules/sky/SkyboxInstance.java

@@ -32,6 +32,7 @@
 import com.mojang.blaze3d.vertex.Tessellator;
 import com.mojang.blaze3d.vertex.VertexBuffer;
 import io.github.axolotlclient.AxolotlClient;
+import io.github.axolotlclient.mixin.TextureManagerAccessor;
 import io.github.axolotlclient.mixin.WorldRendererAccessor;
 import io.github.axolotlclient.util.Util;
 import net.minecraft.client.Minecraft;
@@ -341,6 +342,7 @@ public void remove() {
 		for (Identifier id : textures) {
 			try {
 				Minecraft.getInstance().getTextureManager().close(id);
+				((TextureManagerAccessor)Minecraft.getInstance().getTextureManager()).getTextures().remove(id);
 			} catch (Exception ignored) {
 			}
 		}

1.8.9/src/main/resources/axolotlclient.mixins.json

@@ -55,6 +55,7 @@
 		"SoundManagerAccessor",
 		"SoundSystemAccessor",
 		"TextRendererMixin",
+		"TextureManagerAccessor",
 		"TitleScreenMixin",
 		"TntEntityRendererMixin",
 		"VertexBufferMixin",

gradle.properties

@@ -6,7 +6,7 @@ org.gradle.parallel=true
 axolotlclient.modules.all=true
 
 # Mod Properties
-version=3.1.1-rc.2
+version=3.1.1-rc.3
 
 maven_group=io.github.axolotlclient
 
@@ -31,6 +31,6 @@ fapi_121=0.107.0
 fabric_cts8=0.42.0+1.16
 osl=0.16.1
 
-legacy_lwgjl3=1.2.1+1.8.9
+legacy_lwgjl3=1.2.2+1.8.9
 
 config=3.0.3