Small cleanup

Author: lowercasebtw

src/main/java/btw/lowercase/skyboxify/config/SkyboxifyConfig.java

@@ -24,6 +24,7 @@
 package btw.lowercase.skyboxify.config;
 
 import btw.lowercase.skyboxify.Skyboxify;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 import org.visuals.legacy.lightconfig.lib.v1.Config;
@@ -38,6 +39,13 @@ public class SkyboxifyConfig extends Config {
 
 	public SkyboxifyConfig() {
 		super(Skyboxify.MOD_ID);
+		this.ignoreBrokenSkies.onValueChanged((oldVal, newVal) -> {
+			final Minecraft minecraft = Minecraft.getInstance();
+			// IntelliJ is lying, these can be null (on game start)
+			if (minecraft != null && minecraft.getResourceManager() != null) {
+				minecraft.reloadResourcePacks();
+			}
+		});
 	}
 
 	@Override

src/main/java/btw/lowercase/skyboxify/config/SkyboxifyConfigScreen.java

@@ -57,7 +57,7 @@ protected void init() {
 		rowHelper.addChild(skyboxifyConfig.showOverworldForUnknownDimension.createWidget());
 		rowHelper.addChild(skyboxifyConfig.renderSunMoon.createWidget());
 		rowHelper.addChild(skyboxifyConfig.renderStars.createWidget());
-		rowHelper.addChild(skyboxifyConfig.ignoreBrokenSkies.createWidget(this.minecraft::reloadResourcePacks));
+		rowHelper.addChild(skyboxifyConfig.ignoreBrokenSkies.createWidget());
 		layout.addToContents(gridLayout);
 
 		GridLayout footerGridLayout = new GridLayout();
@@ -73,6 +73,5 @@ protected void init() {
 
 	private void reset() {
 		this.config.reset();
-		this.minecraft.reloadResourcePacks();
 	}
 }

src/main/java/btw/lowercase/skyboxify/skybox/SkyboxResourceHelper.java

@@ -80,48 +80,48 @@ public class SkyboxResourceHelper implements
 			/*resourceManager;
 			 *///?}
         return CompletableFuture.runAsync(() -> {
-            SkyboxManager.INSTANCE.clearSkyboxes();
             if (Skyboxify.getConfig().enabled.isEnabled()) {
+				SkyboxManager.INSTANCE.clearSkyboxes();
 				LOGGER.info("Looking for OptiFine/MCPatcher Skies...");
 				theResourceManager.listPacks().forEach(pack -> {
 					final List<ResourceLocation> optifineSkies = new ArrayList<>();
-					pack.listResources(PackType.CLIENT_RESOURCES, ResourceLocation.DEFAULT_NAMESPACE, OPTIFINE_SKY_PARENT, (resourceLocation, inputStreamIoSupplier) -> optifineSkies.add(resourceLocation));
+					pack.listResources(PackType.CLIENT_RESOURCES, ResourceLocation.DEFAULT_NAMESPACE, OPTIFINE_SKY_PARENT, filterResource(optifineSkies));
+					optifineSkies.sort(compareLocations(OPTIFINE_SKY_PATTERN));
 
 					final List<ResourceLocation> mcpatcherSkies = new ArrayList<>();
-					pack.listResources(PackType.CLIENT_RESOURCES, ResourceLocation.DEFAULT_NAMESPACE, MCPATCHER_SKY_PARENT, (resourceLocation, inputStreamIoSupplier) -> mcpatcherSkies.add(resourceLocation));
+					pack.listResources(PackType.CLIENT_RESOURCES, ResourceLocation.DEFAULT_NAMESPACE, MCPATCHER_SKY_PARENT, filterResource(mcpatcherSkies));
+					mcpatcherSkies.sort(compareLocations(MCPATCHER_SKY_PATTERN));
 
-					this.parseSkyboxes(pack, optifineSkies, mcpatcherSkies);
+					Pattern skyPattern = OPTIFINE_SKY_PATTERN;
+					if (optifineSkies.isEmpty()) {
+						LOGGER.info("Couldn't find any skies under \"optifine\", searching for skies under \"mcpatcher\" instead...");
+						skyPattern = MCPATCHER_SKY_PATTERN;
+					}
+
+					this.parseSkyboxesInPack(pack, (skyPattern == OPTIFINE_SKY_PATTERN ? optifineSkies : mcpatcherSkies), skyPattern);
 				});
             }
         }).thenCompose(preparationBarrier::wait);
     }
 
+	private static PackResources.ResourceOutput filterResource(final List<ResourceLocation> list) {
+		return (resourceLocation, streamIoSupplier) -> {
+			if (resourceLocation.getPath().endsWith(".properties")) {
+				list.add(resourceLocation);
+			}
+		};
+	}
+
     //? <=1.21.8 {
     /*@Override
     public ResourceLocation getFabricId() {
         return Skyboxify.locationOrNull("skybox_reader");
     }
     *///?}
 
-	private void parseSkyboxes(final PackResources packResources, final List<ResourceLocation> optifineSkies, final List<ResourceLocation> mcpatcherSkies) {
-		if (optifineSkies.isEmpty() && mcpatcherSkies.isEmpty()) {
-			return;
-		}
-
-		Pattern skyPattern = OPTIFINE_SKY_PATTERN;
-		List<ResourceLocation> skies = optifineSkies.stream().filter(SkyboxResourceHelper::isProperties).sorted(compareLocations(skyPattern)).toList();
-		if (optifineSkies.isEmpty()) {
-			LOGGER.info("Couldn't find any skies under \"optifine\", searching for skies under \"mcpatcher\" instead...");
-			skyPattern = MCPATCHER_SKY_PATTERN;
-			skies = mcpatcherSkies.stream().filter(SkyboxResourceHelper::isProperties).sorted(compareLocations(skyPattern)).toList();
-		}
-
-		if (!skies.isEmpty()) {
-			this.parseSkyboxesInPack(packResources, skies, skyPattern);
-		}
-	}
-
 	private void parseSkyboxesInPack(final PackResources packResources, final List<ResourceLocation> skies, final Pattern skyPattern) {
+		if (skies.isEmpty()) return;
+
 		final Map<String, JsonArray> layers = new HashMap<>();
 		skies.forEach(id -> {
 			final Matcher matcher = skyPattern.matcher(id.getPath());
@@ -196,8 +196,4 @@ private static Comparator<ResourceLocation> compareLocations(final Pattern patte
 			return 0;
 		});
 	}
-
-	private static boolean isProperties(final ResourceLocation location) {
-		return location.getPath().endsWith(".properties");
-	}
 }