Add Color#lerp and mark old config options as deprecated

MineLittlePony · Apr 30, 2024 · 8a2d26b · 8a2d26b
1 parent af65d85
commit 8a2d26b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/src/main/java/com/minelittlepony/common/util/Color.java b/src/main/java/com/minelittlepony/common/util/Color.java
@@ -1,6 +1,7 @@
 package com.minelittlepony.common.util;
 
 import net.minecraft.util.math.ColorHelper;
+import net.minecraft.util.math.MathHelper;
 
 /**
  * Colouration Utilities
@@ -59,4 +60,16 @@ static int abgrToArgb(int color) {
                 ColorHelper.Argb.getRed(color)
         );
     }
+
+    /**
+     * Interpolates between two colours
+     */
+    static int lerp(float delta, int from, int to) {
+        return argbToHex(
+                MathHelper.lerp(delta, a(from), a(to)),
+                MathHelper.lerp(delta, r(from), r(to)),
+                MathHelper.lerp(delta, g(from), g(to)),
+                MathHelper.lerp(delta, b(from), b(to))
+        );
+    }
 }
diff --git a/src/main/java/com/minelittlepony/common/util/settings/Config.java b/src/main/java/com/minelittlepony/common/util/settings/Config.java
@@ -9,7 +9,7 @@
  * A configuration container that lets you programmatically index values by a key.
  */
 public abstract class Config implements Iterable<Grouping> {
-    @SuppressWarnings("deprecation")
+    @Deprecated
     public static final Adapter FLATTENED_JSON_ADAPTER = LegacyJsonConfigAdapter.DEFAULT;
     public static final Adapter HEIRARCHICAL_JSON_ADAPTER = HeirarchicalJsonConfigAdapter.DEFAULT;
 

diff --git a/src/main/java/com/minelittlepony/common/util/settings/HeirarchicalJsonConfigAdapter.java b/src/main/java/com/minelittlepony/common/util/settings/HeirarchicalJsonConfigAdapter.java
@@ -17,7 +17,7 @@
 import org.apache.logging.log4j.Logger;
 
 public class HeirarchicalJsonConfigAdapter implements Config.Adapter {
-    private static final Logger logger = LogManager.getLogger();
+    private static final Logger LOGGER = LogManager.getLogger();
 
     private final Gson gson;
 
@@ -58,7 +58,7 @@ public void save(Config config, Path file) {
            }
            writer.endObject();
        } catch (IOException e) {
-           logger.warn("Error whilst saving Json config", e);
+           LOGGER.warn("Error whilst saving Json config", e);
        }
     }
 
@@ -79,7 +79,7 @@ public void load(Config config, Path file) {
                         });
                     });
                 } catch (IOException | JsonParseException e) {
-                    logger.warn("Erorr whilst loading json config", e);
+                    LOGGER.warn("Erorr whilst loading json config", e);
                 }
             }
         } finally {

diff --git a/src/main/java/com/minelittlepony/common/util/settings/JsonConfig.java b/src/main/java/com/minelittlepony/common/util/settings/JsonConfig.java
@@ -7,7 +7,7 @@
  *
  * @deprecated Use Config with {@code Config#FLATTENED_JSON_ADAPTER}
  */
-@Deprecated
+@Deprecated(forRemoval = true)
 public class JsonConfig extends Config {
     public JsonConfig(Path path) {
         super(LegacyJsonConfigAdapter.DEFAULT, path);

diff --git a/src/main/java/com/minelittlepony/common/util/settings/LegacyJsonConfigAdapter.java b/src/main/java/com/minelittlepony/common/util/settings/LegacyJsonConfigAdapter.java
@@ -16,7 +16,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-@Deprecated
+@Deprecated(forRemoval = true)
 public class LegacyJsonConfigAdapter implements Config.Adapter {
     private static final Logger logger = LogManager.getLogger();