From e66f414c15bc0e9491097cb8c02fd9d1eae500be Mon Sep 17 00:00:00 2001
From: b3spectacled <modernbetamc@gmail.com>
Date: Thu, 2 Nov 2023 22:54:04 -0700
Subject: [PATCH] Move water colormap textures to own namespace.

---
 gradle.properties                                   |   2 +-
 .../mod/bespectacled/modernbeta/ModernBeta.java     |   4 ++--
 .../client/resource/ModernBetaColormapResource.java |   4 +---
 .../textures}/colormap/underwater.png               | Bin
 .../textures}/colormap/water.png                    | Bin
 5 files changed, 4 insertions(+), 6 deletions(-)
 rename src/main/resources/assets/{minecraft/optifine => modern_beta/textures}/colormap/underwater.png (100%)
 rename src/main/resources/assets/{minecraft/optifine => modern_beta/textures}/colormap/water.png (100%)

diff --git a/gradle.properties b/gradle.properties
index 34f3744d..8b465550 100644
--- a/gradle.properties
+++ b/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
 
diff --git a/src/main/java/mod/bespectacled/modernbeta/ModernBeta.java b/src/main/java/mod/bespectacled/modernbeta/ModernBeta.java
index d32ace48..79734d57 100644
--- a/src/main/java/mod/bespectacled/modernbeta/ModernBeta.java
+++ b/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
             ));
         }
diff --git a/src/main/java/mod/bespectacled/modernbeta/client/resource/ModernBetaColormapResource.java b/src/main/java/mod/bespectacled/modernbeta/client/resource/ModernBetaColormapResource.java
index 318e1a5b..e29bda89 100644
--- a/src/main/java/mod/bespectacled/modernbeta/client/resource/ModernBetaColormapResource.java
+++ b/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);
         }
diff --git a/src/main/resources/assets/minecraft/optifine/colormap/underwater.png b/src/main/resources/assets/modern_beta/textures/colormap/underwater.png
similarity index 100%
rename from src/main/resources/assets/minecraft/optifine/colormap/underwater.png
rename to src/main/resources/assets/modern_beta/textures/colormap/underwater.png
diff --git a/src/main/resources/assets/minecraft/optifine/colormap/water.png b/src/main/resources/assets/modern_beta/textures/colormap/water.png
similarity index 100%
rename from src/main/resources/assets/minecraft/optifine/colormap/water.png
rename to src/main/resources/assets/modern_beta/textures/colormap/water.png