Allow bare file names as relative paths.

velnias75 · Feb 4, 2023 · 9fe5adf · 9fe5adf
1 parent d144199
commit 9fe5adf
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ org.gradle.jvmargs=-Xmx1G
 	yarn_mappings=1.19+build.1
 	loader_version=0.14.6
 # Mod Properties
-	mod_version = 3.1.2
+	mod_version = 3.1.3-snapshot
 	maven_group = io.github.kvverti
 	archives_base_name = colormatic
 

diff --git a/src/main/java/io/github/kvverti/colormatic/properties/DefaultColumns.java b/src/main/java/io/github/kvverti/colormatic/properties/DefaultColumns.java
@@ -26,7 +26,6 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.checkerframework.checker.units.qual.C;
 
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
@@ -299,8 +298,8 @@ private static Map<Identifier, ColormapProperties.ColumnBounds> createLegacyColu
         // 1.19 wild biomes
         // mangrove swamp -> swamp
         map.put(BiomeKeys.MANGROVE_SWAMP.getValue(), new ColormapProperties.ColumnBounds(6, 1));
-        // deep dark -> ocean ¯\_(ツ)_/¯
-        map.put(BiomeKeys.DEEP_DARK.getValue(), new ColormapProperties.ColumnBounds(0, 1));
+        // deep dark -> lush caves
+        map.put(BiomeKeys.DEEP_DARK.getValue(), new ColormapProperties.ColumnBounds(175, 1));
         return map;
     }
 

diff --git a/src/main/java/io/github/kvverti/colormatic/properties/GlobalColorProperties.java b/src/main/java/io/github/kvverti/colormatic/properties/GlobalColorProperties.java
@@ -36,7 +36,6 @@
 import net.minecraft.block.MapColor;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.effect.StatusEffect;
-import net.minecraft.resource.Resource;
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.text.TextColor;
 import net.minecraft.util.DyeColor;

diff --git a/src/main/java/io/github/kvverti/colormatic/properties/PropertyUtil.java b/src/main/java/io/github/kvverti/colormatic/properties/PropertyUtil.java
@@ -75,6 +75,10 @@ public static String resolve(String path, Identifier id) {
         } else if(path.startsWith("~/")) {
             // ~ is the optifine directory
             path = "optifine" + path.substring(1);
+        } else if(!path.contains("/") && !path.contains(":")) {
+            // relative path - not a file path or a namespaced path
+            String thisPath = id.toString();
+            path = thisPath.substring(0, thisPath.lastIndexOf('/') + 1) + path;
         }
         return path;
     }

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -40,7 +40,7 @@
   },
   "recommends": {
     "quilt_loader": "*",
-    "modmenu": "^3.0.0"
+    "modmenu": "^4.0.0"
   },
   "suggests": {
     "flamingo": "*"