Rework how mcpatcher is handled

Author: lowercasebtw

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.parallel=true
 # Mod properties
 mod.name=Skyboxify
 mod.id=skyboxify
-mod.version=2.0
+mod.version=2.1
 mod.group=btw.lowercase
 mod.description=A skybox mod that allows you to use OptiFine skies in Fabric 1.21+
 mod.source=https://github.com/Legacy-Visuals-Project/Skyboxify

src/main/java/btw/lowercase/skyboxify/Skyboxify.java

@@ -26,13 +26,11 @@
 import btw.lowercase.skyboxify.config.SkyboxifyConfig;
 import btw.lowercase.skyboxify.events.LevelTickEvent;
 import btw.lowercase.skyboxify.events.SkyRenderEvent;
-import btw.lowercase.skyboxify.skybox.*;
-import btw.lowercase.skyboxify.utils.ParserCodecs;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
+import btw.lowercase.skyboxify.skybox.Skybox;
+import btw.lowercase.skyboxify.skybox.SkyboxManager;
+import btw.lowercase.skyboxify.skybox.SkyboxSkyRenderer;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.math.Axis;
-import com.mojang.serialization.JsonOps;
 import lombok.Getter;
 import lombok.experimental.UtilityClass;
 import net.minecraft.client.multiplayer.ClientLevel;
@@ -43,15 +41,7 @@
 import org.slf4j.LoggerFactory;
 import org.visuals.legacy.lightconfig.lib.v1.events.EventManager;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.nio.file.Path;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 @UtilityClass
 public class Skyboxify {
@@ -60,11 +50,6 @@ public class Skyboxify {
 	private final Logger logger = LoggerFactory.getLogger(Skyboxify.class);
 	@Getter
 	private final EventManager eventManager = new EventManager();
-	private final String OPTIFINE_SKY_PARENT = "optifine/sky";
-	private final String SKY_PATTERN_ENDING = "(?<world>[\\w-]+)/(?<name>\\w+).properties$";
-	private final Pattern OPTIFINE_SKY_PATTERN = Pattern.compile(OPTIFINE_SKY_PARENT + "/" + SKY_PATTERN_ENDING);
-	private final String MCPATCHER_SKY_PARENT = "mcpatcher/sky";
-	private final Pattern MCPATCHER_SKY_PATTERN = Pattern.compile(MCPATCHER_SKY_PARENT + "/" + SKY_PATTERN_ENDING);
 	@Getter
 	private SkyboxifyConfig config;
 
@@ -117,90 +102,4 @@ private void renderSkyboxes(ClientLevel clientLevel, float tickDelta) {
 			}
 		}
 	}
-
-	public void convert(SkyboxResourceHelper skyboxResourceHelper) {
-		if (config.processOptiFine.isEnabled()) {
-			parseSkyboxes(skyboxResourceHelper, OPTIFINE_SKY_PARENT, OPTIFINE_SKY_PATTERN);
-		}
-
-		if (config.processMCPatcher.isEnabled()) {
-			parseSkyboxes(skyboxResourceHelper, MCPATCHER_SKY_PARENT, MCPATCHER_SKY_PATTERN);
-		}
-	}
-
-	private void parseSkyboxes(SkyboxResourceHelper skyboxResourceHelper, String skyParent, Pattern skyPattern) {
-		final Map<String, JsonArray> layers = new HashMap<>();
-		layers.put("world0", new JsonArray()); // Overworld
-		layers.put("world-1", new JsonArray()); // Nether
-		layers.put("world1", new JsonArray()); // The End
-		skyboxResourceHelper.searchIn(skyParent).filter(id -> id.getPath().endsWith(".properties")).sorted(Comparator.comparing(ResourceLocation::getPath, (id1, id2) -> {
-			final Matcher matcherId1 = skyPattern.matcher(id1);
-			final Matcher matcherId2 = skyPattern.matcher(id2);
-			if (matcherId1.find() && matcherId2.find()) {
-				final int a = ParserCodecs.safeParseInteger(matcherId1.group("name").replace("sky", ""), -1);
-				final int b = ParserCodecs.safeParseInteger(matcherId2.group("name").replace("sky", ""), -1);
-				if (a >= 0 && b >= 0) {
-					return a - b;
-				}
-			}
-
-			return 0;
-		})).forEach(id -> {
-			final Matcher matcher = skyPattern.matcher(id.getPath());
-			if (matcher.find()) {
-				final String world = matcher.group("world");
-				final String name = matcher.group("name");
-				if (world == null || name == null) {
-					return;
-				}
-
-				if (name.equals("moon_phases") || name.equals("sun")) {
-					// TODO/NOTE: Support moon/sun
-					logger.warn("Skipping {}, moon_phases/sun aren't currently supported!", id);
-					return;
-				}
-
-				final InputStream inputStream = skyboxResourceHelper.getInputStream(id);
-				if (inputStream == null) {
-					logger.error("Error trying to read namespaced identifier: {}", id);
-					return;
-				}
-
-				final Properties properties = new Properties();
-				try {
-					properties.load(inputStream);
-				} catch (IOException e) {
-					logger.error("Error trying to read properties from: {}", id);
-					return;
-				} finally {
-					try {
-						inputStream.close();
-					} catch (IOException e) {
-						logger.error("Error trying to close input stream at namespaced identifier: {}", id);
-					}
-				}
-
-				final JsonObject json = SkyboxParser.parseSkyProperties(properties, id);
-				// NOTE: Don't add broken skies (returns null if broken)
-				if (json != null && layers.containsKey(world)) {
-					layers.get(world).add(json);
-				}
-			}
-		});
-
-		for (Map.Entry<String, JsonArray> entry : layers.entrySet()) {
-			final JsonArray skyLayers = entry.getValue();
-			if (!skyLayers.isEmpty()) {
-				final JsonObject skyboxJson = new JsonObject();
-				skyboxJson.add("layers", skyLayers);
-				skyboxJson.addProperty("world", switch (entry.getKey()) {
-					case "world0" -> "overworld";
-					case "world-1" -> "nether";
-					case "world1" -> "end";
-					default -> entry.getKey();
-				});
-				SkyboxManager.INSTANCE.addSkybox(Skybox.CODEC.decode(JsonOps.INSTANCE, skyboxJson).getOrThrow().getFirst());
-			}
-		}
-	}
 }

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

@@ -34,8 +34,6 @@
 
 public class SkyboxifyConfig extends Config {
 	public final BooleanConfigField enabled = this.booleanFieldOf("enabled", true);
-	public final BooleanConfigField processOptiFine = this.booleanFieldOf("processOptiFine", true);
-	public final BooleanConfigField processMCPatcher = this.booleanFieldOf("processMCPatcher", false);
 	public final BooleanConfigField renderSunMoon = this.booleanFieldOf("renderSunMoon", true);
 	public final BooleanConfigField renderStars = this.booleanFieldOf("renderStars", true);
 	public final BooleanConfigField showOverworldForUnknownDimension = this.booleanFieldOf("showOverworldForUnknownDimension", true);
@@ -44,8 +42,6 @@ public class SkyboxifyConfig extends Config {
 	public SkyboxifyConfig(final Path path) {
 		super(Skyboxify.MOD_ID, path);
 		final Minecraft minecraft = Minecraft.getInstance();
-		this.processOptiFine.onValueChanged((oldVal, newVal) -> minecraft.reloadResourcePacks());
-		this.processMCPatcher.onValueChanged((oldVal, newVal) -> minecraft.reloadResourcePacks());
 		this.ignoreBrokenSkies.onValueChanged((oldVal, newVal) -> minecraft.reloadResourcePacks());
 	}
 

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

@@ -55,8 +55,6 @@ protected void init() {
         // Didn't iterate fields here because I wanted custom order
         rowHelper.addChild(skyboxifyConfig.enabled.createWidget());
         rowHelper.addChild(skyboxifyConfig.showOverworldForUnknownDimension.createWidget());
-        rowHelper.addChild(skyboxifyConfig.processOptiFine.createWidget());
-        rowHelper.addChild(skyboxifyConfig.processMCPatcher.createWidget());
         rowHelper.addChild(skyboxifyConfig.renderSunMoon.createWidget());
         rowHelper.addChild(skyboxifyConfig.renderStars.createWidget());
         rowHelper.addChild(skyboxifyConfig.ignoreBrokenSkies.createWidget());

src/main/java/btw/lowercase/skyboxify/screen/SkyLayerListScreen.java

@@ -42,9 +42,9 @@ public class SkyLayerListScreen extends DebugScreen {
 	public SkyLayerListScreen(final Screen parent, final Skybox skybox) {
 		super(Component.literal(
 				//? >=1.21.11 {
-				/*skybox.getWorldResourceKey().identifier().toString()
+				/*skybox.getWorldKey().identifier().toString()
 				 *///?} else {
-				skybox.getWorldResourceKey().location().toString()
+				skybox.getWorldKey().location().toString()
 				//?}
 		), parent);
 		this.skybox = skybox;

src/main/java/btw/lowercase/skyboxify/screen/SkyboxListScreen.java

@@ -55,7 +55,7 @@ protected void init() {
 
 		final List<Gidget> gidgets = new ArrayList<>();
 		for (final Skybox skybox : this.skyboxes) {
-			final Component name = Component.literal(skybox.getWorldResourceKey().location().toString())
+			final Component name = Component.literal(skybox.getWorldKey().location().toString())
 					.withColor(skybox.isActive() ? ARGB.color(155, 0x00FF00) : ARGB.color(155, 0xFF0000));
 			gidgets.add(SimpleButton.builder(name,button -> this.minecraft.setScreen(new SkyLayerListScreen(this, skybox))).build());
 		}

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

@@ -39,36 +39,36 @@
 
 public class Skybox {
 	public static final Codec<Skybox> CODEC = RecordCodecBuilder.create(instance -> instance.group(
-			SkyLayer.CODEC.listOf().optionalFieldOf("layers", ImmutableList.of()).forGetter(Skybox::getLayers),
-			Level.RESOURCE_KEY_CODEC.fieldOf("world").forGetter(Skybox::getWorldResourceKey)
+			Level.RESOURCE_KEY_CODEC.fieldOf("world").forGetter(Skybox::getWorldKey),
+			SkyLayer.CODEC.listOf().fieldOf("layers").forGetter(Skybox::getLayers)
 	).apply(instance, Skybox::new));
 
 	@Getter
 	private final List<SkyLayer> layers;
 	@Getter
-	private final ResourceKey<@NotNull Level> worldResourceKey;
+	private final ResourceKey<@NotNull Level> worldKey;
 	private final Map<SkyLayer, Float> alphaMap = new HashMap<>();
 	@Getter
 	private boolean active = true;
 
-	public Skybox(List<SkyLayer> layers, ResourceKey<@NotNull Level> worldResourceKey) {
+	public Skybox(final ResourceKey<@NotNull Level> worldKey, final List<SkyLayer> layers) {
+		this.worldKey = worldKey;
 		this.layers = layers;
-		this.worldResourceKey = worldResourceKey;
 	}
 
-	public void tick(ClientLevel level) {
+	public void tick(final ClientLevel level) {
 		this.active = true;
 
-		final boolean allowOtherDimensions = Skyboxify.getConfig().showOverworldForUnknownDimension.isEnabled() && this.worldResourceKey.equals(Level.OVERWORLD) && !level.dimension().equals(Level.NETHER) && !level.dimension().equals(Level.END);
-		if (level.dimension().equals(this.worldResourceKey) || allowOtherDimensions) {
+		final boolean allowOtherDimensions = Skyboxify.getConfig().showOverworldForUnknownDimension.isEnabled() && this.worldKey.equals(Level.OVERWORLD) && !level.dimension().equals(Level.NETHER) && !level.dimension().equals(Level.END);
+		if (level.dimension().equals(this.worldKey) || allowOtherDimensions) {
 			this.layers.forEach(layer -> alphaMap.put(layer, layer.getPositionBrightness(level, this.getConditionAlphaFor(layer))));
 		} else {
 			this.layers.forEach(layer -> alphaMap.put(layer, -1.0F));
 			this.active = false;
 		}
 	}
 
-	public float getConditionAlphaFor(SkyLayer skyLayer) {
+	public float getConditionAlphaFor(final SkyLayer skyLayer) {
 		return this.alphaMap.getOrDefault(skyLayer, -1.0F);
 	}
 }

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

@@ -46,7 +46,7 @@ public final class SkyboxManager {
 	private SkyboxManager() {
 	}
 
-	public void addSkybox(Skybox skybox) {
+	public void addSkybox(final Skybox skybox) {
 		Preconditions.checkNotNull(skybox, "Skybox was null");
 		this.loadedSkyboxes.add(skybox);
 	}
@@ -57,7 +57,7 @@ public void clearSkyboxes() {
 		this.activeSkyboxes.clear();
 	}
 
-	public void tick(ClientLevel level) {
+	public void tick(final ClientLevel level) {
 		if (!Skyboxify.getConfig().enabled.isEnabled()) {
 			return;
 		}
@@ -74,15 +74,15 @@ public void tick(ClientLevel level) {
 		}
 	}
 
-	public boolean isEnabled(Level level) {
+	public boolean isEnabled(final Level level) {
 		return Skyboxify.getConfig().enabled.isEnabled() && !activeSkyboxes.isEmpty() && level != null;
 	}
 
-	public List<Skybox> getSkiesFor(ResourceKey<@NotNull Level> resourceKey) {
-		return getActiveSkyboxes().stream().filter(skybox -> resourceKey.equals(skybox.getWorldResourceKey())).toList();
+	public List<Skybox> getSkiesFor(final ResourceKey<@NotNull Level> resourceKey) {
+		return getActiveSkyboxes().stream().filter(skybox -> resourceKey.equals(skybox.getWorldKey())).toList();
 	}
 
-	public boolean containsEnabled(ResourceKey<@NotNull Level> resourceKey) {
+	public boolean containsEnabled(final ResourceKey<@NotNull Level> resourceKey) {
 		return !getSkiesFor(resourceKey).isEmpty();
 	}
 }