v1.3

lowercasebtw · lowercasebtw · commit 08894c43a0a0 · 2025-08-06T13:12:28.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -67,7 +67,6 @@ java {
         toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
     }
 
-    archivesBaseName = project.archives_base_name
     withSourcesJar()
     sourceCompatibility = javaVersion
     targetCompatibility = javaVersion
diff --git a/gradle.properties b/gradle.properties
@@ -5,14 +5,14 @@ org.gradle.parallel=true
 # Fabric Properties
 # check these on https://fabricmc.net/develop
 minecraft_version=1.21.5
-loader_version=0.16.14
+loader_version=0.17.1
 loom_version=1.11-SNAPSHOT
 
 # Dependencies
 fabric_version=0.128.1+1.21.5
 modmenu_version=14.0.0-rc.2
 
 # Mod Properties
-mod_version=1.2
+mod_version=1.3
 maven_group=btw.lowercase
 archives_base_name=optiboxes
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/settings.gradle b/settings.gradle
@@ -1,8 +1,8 @@
 pluginManagement {
     repositories {
         maven {
-            name = 'Fabric'
-            url = 'https://maven.fabricmc.net/'
+            name = "Fabric"
+            url = "https://maven.fabricmc.net/"
         }
         gradlePluginPortal()
     }
diff --git a/src/main/java/btw/lowercase/lightconfig/lib/v1/screen/ConfigScreenBuilder.java b/src/main/java/btw/lowercase/lightconfig/lib/v1/screen/ConfigScreenBuilder.java
@@ -0,0 +1,33 @@
+package btw.lowercase.lightconfig.lib.v1.screen;
+
+import btw.lowercase.lightconfig.lib.v1.Config;
+import btw.lowercase.optiboxes.config.OptiBoxesConfig;
+import btw.lowercase.optiboxes.config.OptiBoxesConfigScreen;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+import org.jetbrains.annotations.Nullable;
+
+public class ConfigScreenBuilder {
+    private final Config config;
+    private Component title = Component.empty();
+
+    private ConfigScreenBuilder(Config config) {
+        this.config = config;
+    }
+
+    public static ConfigScreenBuilder builder(Config config) {
+        return new ConfigScreenBuilder(config);
+    }
+
+    // TODO
+
+    public ConfigScreenBuilder setTitle(Component title) {
+        this.title = title;
+        return this;
+    }
+
+    public Screen build(@Nullable Screen parent) {
+        return new OptiBoxesConfigScreen(parent, this.title, (OptiBoxesConfig) this.config);
+        // TODO : return new ConfigScreen(this.title, this.config, parent);
+    }
+}
diff --git a/src/main/java/btw/lowercase/optiboxes/OptiBoxesClient.java b/src/main/java/btw/lowercase/optiboxes/OptiBoxesClient.java
@@ -139,9 +139,11 @@ private void parseSkyboxes(SkyboxResourceHelper skyboxResourceHelper, String sky
                 }
 
                 final JsonObject json = CommonUtils.convertOptiFineSkyProperties(skyboxResourceHelper, properties, id);
-                switch (world) {
-                    case "world0" -> overworldLayers.add(json);
-                    case "world1" -> endLayers.add(json);
+                if (json != null) { // NOTE: Don't add broken skies (returns null if broken)
+                    switch (world) {
+                        case "world0" -> overworldLayers.add(json);
+                        case "world1" -> endLayers.add(json);
+                    }
                 }
             }
         });
diff --git a/src/main/java/btw/lowercase/optiboxes/config/ModMenuIntegration.java b/src/main/java/btw/lowercase/optiboxes/config/ModMenuIntegration.java
@@ -7,6 +7,6 @@
 public class ModMenuIntegration implements ModMenuApi {
     @Override
     public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return (parent) -> OptiBoxesClient.getConfig().getConfigScreen(parent);
+        return OptiBoxesClient.getConfig()::getConfigScreen;
     }
 }
diff --git a/src/main/java/btw/lowercase/optiboxes/config/OptiBoxesConfig.java b/src/main/java/btw/lowercase/optiboxes/config/OptiBoxesConfig.java
@@ -2,8 +2,10 @@
 
 import btw.lowercase.lightconfig.lib.v1.Config;
 import btw.lowercase.lightconfig.lib.v1.field.BooleanConfigField;
+import btw.lowercase.lightconfig.lib.v1.screen.ConfigScreenBuilder;
 import btw.lowercase.optiboxes.OptiBoxesClient;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
 
 import java.nio.file.Path;
 
@@ -14,13 +16,17 @@ public class OptiBoxesConfig extends Config {
     public final BooleanConfigField renderSunMoon = this.booleanFieldOf("renderSunMoon", true);
     public final BooleanConfigField renderStars = this.booleanFieldOf("renderStars", true);
     public final BooleanConfigField showOverworldForUnknownDimension = this.booleanFieldOf("showOverworldForUnknownDimension", true);
+    public final BooleanConfigField ignoreBrokenSkies = this.booleanFieldOf("ignoreBrokenSkies", false);
 
     public OptiBoxesConfig(Path path) {
         super(OptiBoxesClient.INSTANCE.getModContainer(), path);
     }
 
     @Override
     public Screen getConfigScreen(Screen parent) {
-        return new OptiBoxesConfigScreen(parent, this);
+        ConfigScreenBuilder builder = ConfigScreenBuilder.builder(this)
+                .setTitle(Component.translatable("options.optiboxes.title"));
+        // TODO: Add config stuff
+        return builder.build(parent);
     }
 }
diff --git a/src/main/java/btw/lowercase/optiboxes/config/OptiBoxesConfigScreen.java b/src/main/java/btw/lowercase/optiboxes/config/OptiBoxesConfigScreen.java
@@ -13,13 +13,11 @@
 import net.minecraft.network.chat.Component;
 
 public class OptiBoxesConfigScreen extends Screen {
-    public static final Component TITLE = Component.translatable("options.optiboxes.title");
-
     private final Screen parent;
     private final OptiBoxesConfig config;
 
-    public OptiBoxesConfigScreen(Screen parent, OptiBoxesConfig config) {
-        super(TITLE);
+    public OptiBoxesConfigScreen(Screen parent, Component title, OptiBoxesConfig config) {
+        super(title);
         this.parent = parent;
         this.config = config;
     }
@@ -30,7 +28,7 @@ protected void init() {
 
         HeaderAndFooterLayout layout = new HeaderAndFooterLayout(this, 61, 33);
         LinearLayout linearLayout = layout.addToHeader(LinearLayout.vertical().spacing(8));
-        linearLayout.addChild(new StringWidget(TITLE, this.font), LayoutSettings::alignHorizontallyCenter);
+        linearLayout.addChild(new StringWidget(this.getTitle(), this.font), LayoutSettings::alignHorizontallyCenter);
 
         GridLayout gridLayout = new GridLayout();
         gridLayout.defaultCellSetting().paddingHorizontal(4).paddingBottom(4).alignHorizontallyCenter().alignVerticallyMiddle();
@@ -42,6 +40,7 @@ protected void init() {
         rowHelper.addChild(config.processMCPatcher.createWidget(() -> this.minecraft.reloadResourcePacks()));
         rowHelper.addChild(config.renderSunMoon.createWidget());
         rowHelper.addChild(config.renderStars.createWidget());
+        rowHelper.addChild(config.ignoreBrokenSkies.createWidget(() -> this.minecraft.reloadResourcePacks()));
         layout.addToContents(gridLayout);
 
         GridLayout footerGridLayout = new GridLayout();
diff --git a/src/main/java/btw/lowercase/optiboxes/utils/CommonUtils.java b/src/main/java/btw/lowercase/optiboxes/utils/CommonUtils.java
@@ -1,5 +1,6 @@
 package btw.lowercase.optiboxes.utils;
 
+import btw.lowercase.optiboxes.OptiBoxesClient;
 import btw.lowercase.optiboxes.utils.components.Range;
 import btw.lowercase.optiboxes.utils.components.Weather;
 import com.google.gson.JsonArray;
@@ -46,9 +47,15 @@ public final class CommonUtils {
     private CommonUtils() {
     }
 
-    public static JsonObject convertOptiFineSkyProperties(SkyboxResourceHelper skyboxResourceHelper, Properties properties, ResourceLocation propertiesResourceLocation) {
+    public static @Nullable JsonObject convertOptiFineSkyProperties(SkyboxResourceHelper skyboxResourceHelper, Properties properties, ResourceLocation propertiesResourceLocation) {
         JsonObject jsonObject = new JsonObject();
-        Optional<ResourceLocation> sourceTexture = Optional.ofNullable(parseSourceTexture(properties.getProperty("source", null), skyboxResourceHelper, propertiesResourceLocation));
+        String sourceString = properties.getProperty("source", null);
+        Optional<ResourceLocation> sourceTexture = Optional.ofNullable(parseSourceTexture(sourceString, skyboxResourceHelper, propertiesResourceLocation));
+        if (sourceTexture.isEmpty() && OptiBoxesClient.getConfig().ignoreBrokenSkies.isEnabled()) {
+            LOGGER.warn("Detected a broken source texture path \"{}\" whilst loading a sky. Since the ignoreBrokenSkies setting is enabled, this sky will be ignored.", sourceString);
+            return null;
+        }
+
         jsonObject.addProperty("source", sourceTexture.orElse(MissingTextureAtlasSprite.getLocation()).toString());
 
         // Blend
diff --git a/src/main/resources/assets/optiboxes/lang/en_us.json b/src/main/resources/assets/optiboxes/lang/en_us.json
@@ -12,6 +12,8 @@
 	"options.optiboxes.renderStars.tooltip": "Enable/disable rendering of the stars.",
 	"options.optiboxes.showOverworldForUnknownDimension": "Show Overworld In Unknown Dimensions",
 	"options.optiboxes.showOverworldForUnknownDimension.tooltip": "Will show the overworld skyboxes in unknown dimensions. Will not show in nether/end though unless a skybox defines it.",
+	"options.optiboxes.ignoreBrokenSkies": "Ignore Broken Skies",
+	"options.optiboxes.ignoreBrokenSkies.tooltip": "If something inside of a sky layer fails to load, it will ignore it and not load it.",
 	"options.template": "%s: %s",
 	"options.on": "ON",
 	"options.off": "OFF",

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@ java {`
`67`	`67`	`toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)`
`68`	`68`	`}`
`69`	`69`
`70`		`- archivesBaseName = project.archives_base_name`
`71`	`70`	`withSourcesJar()`
`72`	`71`	`sourceCompatibility = javaVersion`
`73`	`72`	`targetCompatibility = javaVersion`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`pluginManagement {`
`2`	`2`	`repositories {`
`3`	`3`	`maven {`
`4`		`- name = 'Fabric'`
`5`		`- url = 'https://maven.fabricmc.net/'`
	`4`	`+ name = "Fabric"`
	`5`	`+ url = "https://maven.fabricmc.net/"`
`6`	`6`	`}`
`7`	`7`	`gradlePluginPortal()`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,9 +139,11 @@ private void parseSkyboxes(SkyboxResourceHelper skyboxResourceHelper, String sky`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`final JsonObject json = CommonUtils.convertOptiFineSkyProperties(skyboxResourceHelper, properties, id);`
`142`		`- switch (world) {`
`143`		`- case "world0" -> overworldLayers.add(json);`
`144`		`- case "world1" -> endLayers.add(json);`
	`142`	`+ if (json != null) { // NOTE: Don't add broken skies (returns null if broken)`
	`143`	`+ switch (world) {`
	`144`	`+ case "world0" -> overworldLayers.add(json);`
	`145`	`+ case "world1" -> endLayers.add(json);`
	`146`	`+ }`
`145`	`147`	`}`
`146`	`148`	`}`
`147`	`149`	`});`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`	`public class ModMenuIntegration implements ModMenuApi {`
`8`	`8`	`@Override`
`9`	`9`	`public ConfigScreenFactory<?> getModConfigScreenFactory() {`
`10`		`- return (parent) -> OptiBoxesClient.getConfig().getConfigScreen(parent);`
	`10`	`+ return OptiBoxesClient.getConfig()::getConfigScreen;`
`11`	`11`	`}`
`12`	`12`	`}`