From b04ac9e5a4d38a02d2da6fdcf7cc339697659b2c Mon Sep 17 00:00:00 2001
From: Torrie Fischer <tdfischer@hackerbots.net>
Date: Fri, 11 Jun 2021 09:34:02 -0700
Subject: [PATCH] region: re-implement default colors based on names

---
 src/main/java/us/camin/regions/Region.java    | 41 +++++++++++++++----
 .../regions/config/RegionConfiguration.java   |  9 ++--
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/main/java/us/camin/regions/Region.java b/src/main/java/us/camin/regions/Region.java
index db61b1d..31b05b7 100644
--- a/src/main/java/us/camin/regions/Region.java
+++ b/src/main/java/us/camin/regions/Region.java
@@ -42,15 +42,13 @@ public class Region {
     private Location m_location;
     private String m_name;
     private List<Pattern> m_bannerPatterns = new ArrayList<Pattern>();
-    private DyeColor m_color = null;
+    private DyeColor m_color = DyeColor.values()[(int)(System.currentTimeMillis() % DyeColor.values().length)];
     private List<UUID> m_seenPlayers = new ArrayList<UUID>();
     private boolean m_isHub = false;
 
     public Region(String name, Location location) {
         m_location = location.toBlockLocation();
         m_name = name;
-        // Pick a random color
-        m_color = DyeColor.values()[(int)(System.currentTimeMillis() % DyeColor.values().length)];
     }
 
     public Region(String name, Location location, int visits, int charges, DyeColor color) {
@@ -61,17 +59,46 @@ public class Region {
         m_color = color;
     }
 
+    private static DyeColor[] defaultColors = {
+      DyeColor.LIGHT_BLUE,
+      DyeColor.BLACK,
+      DyeColor.BLUE,
+      DyeColor.CYAN,
+      DyeColor.BLUE,
+      DyeColor.GRAY,
+      DyeColor.GREEN,
+      DyeColor.PURPLE,
+      DyeColor.RED,
+      DyeColor.ORANGE,
+      DyeColor.GRAY,
+      DyeColor.GREEN,
+      DyeColor.MAGENTA,
+      DyeColor.RED,
+      DyeColor.WHITE,
+      DyeColor.YELLOW,
+    };
+
+    private DyeColor defaultColorForName(String name) {
+        int colorCount = defaultColors.length;
+        int hashed = Math.abs(name.hashCode());
+        return defaultColors[hashed % (colorCount - 1)];
+    }
+
     public Region(String name, World world, RegionConfiguration conf) {
     	if (conf.y == -1) {
-            Location defaultLoc = new Location(world, conf.x, 64, conf.z);
-            conf.y = world.getHighestBlockAt(defaultLoc).getY();
-        }
+        Location defaultLoc = new Location(world, conf.x, 64, conf.z);
+        conf.y = world.getHighestBlockAt(defaultLoc).getY();
+      }
     	m_name = name;
     	m_visits = conf.visits;
       m_charges = conf.charges;
       m_location = new Location(world, conf.x, conf.y, conf.z);
       m_bannerPatterns = conf.patterns;
-      m_color = conf.color;
+      if (conf.color == null) {
+        m_color = defaultColorForName(name);
+      } else {
+        m_color = conf.color;
+      }
       m_seenPlayers = conf.seenBy;
       m_isHub = conf.isHub;
     }
diff --git a/src/main/java/us/camin/regions/config/RegionConfiguration.java b/src/main/java/us/camin/regions/config/RegionConfiguration.java
index c7f6a22..5f68604 100644
--- a/src/main/java/us/camin/regions/config/RegionConfiguration.java
+++ b/src/main/java/us/camin/regions/config/RegionConfiguration.java
@@ -16,7 +16,7 @@ import us.camin.regions.Region;
 import java.util.UUID;
 
 public class RegionConfiguration implements ConfigurationSerializable {
-	public int x;
+    public int x;
     public int y;
     public int z;
     public int visits;
@@ -24,7 +24,7 @@ public class RegionConfiguration implements ConfigurationSerializable {
     public boolean isHub;
     public List<Pattern> patterns;
     public List<UUID> seenBy;
-    public DyeColor color = DyeColor.YELLOW;
+    public DyeColor color = null;
 
     public RegionConfiguration(Region region) {
         Location loc = region.location();
@@ -47,7 +47,10 @@ public class RegionConfiguration implements ConfigurationSerializable {
         visits = (Integer)confSection.getOrDefault("visits", 0);
         charges = (Integer)confSection.getOrDefault("charges", 0);
         patterns = (List<Pattern>)confSection.getOrDefault("banner", new ArrayList<Pattern>());
-        color = DyeColor.valueOf((String)confSection.getOrDefault("color", "YELLOW"));
+        String colorStr = (String)confSection.getOrDefault("color", null);
+        if (colorStr != null) {
+          color = DyeColor.valueOf(colorStr);
+        }
         seenBy = new ArrayList<UUID>();
         List<String> strList = (List<String>)confSection.getOrDefault("seenBy", new ArrayList<String>());
         for(String s : strList) {