Move water colormap textures to own namespace.

gradle.properties

@@ -7,7 +7,7 @@ yarn_mappings=1.20.2+build.4
 loader_version=0.14.24
 
 # Mod Properties
-mod_version = 6.4.2
+mod_version = 6.5
 maven_group = mod.bespectacled
 archives_base_name = modern-beta-fabric
 

src/main/java/mod/bespectacled/modernbeta/ModernBeta.java

@@ -82,12 +82,12 @@ public void onInitialize() {
             ResourceManagerHelper resourceManager = ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES);
 
             resourceManager.registerReloadListener(new ModernBetaColormapResource(
-                "colormap/water.png",
+                "textures/colormap/water.png",
                 BlockColorSampler.INSTANCE.colormapWater::setColormap
             ));
 
             resourceManager.registerReloadListener(new ModernBetaColormapResource(
-                "colormap/underwater.png",
+                "textures/colormap/underwater.png",
                 BlockColorSampler.INSTANCE.colormapUnderwater::setColormap
             ));
         }

src/main/java/mod/bespectacled/modernbeta/client/resource/ModernBetaColormapResource.java

@@ -11,12 +11,10 @@
 
 public class ModernBetaColormapResource implements SimpleSynchronousResourceReloadListener {
     private final Identifier id;
-    private final Identifier optifineId;
     private final Consumer<int[]> consumer;
 
     public ModernBetaColormapResource(String path, Consumer<int[]> consumer) {
         this.id = ModernBeta.createId(path);
-        this.optifineId = new Identifier("optifine/" + path);
         this.consumer = consumer;
     }
 
@@ -31,7 +29,7 @@ public void reload(ResourceManager resourceManager) {
         int[] map;
 
         try {
-            map = RawTextureDataLoader.loadRawTextureData(resourceManager, this.optifineId);
+            map = RawTextureDataLoader.loadRawTextureData(resourceManager, this.id);
         } catch (IOException exception) {
             throw new IllegalStateException("[Modern Beta] Failed to load colormap texture!", exception);
         }