From 6032dda70078cfcab34760e2910c08dec631a0e4 Mon Sep 17 00:00:00 2001
From: SamB440 <sam@islandearth.net>
Date: Sun, 19 Apr 2020 20:33:11 +0100
Subject: [PATCH] Fix old file loading, fix colour codes

---
 RPGRegions.iml                                  |  2 +-
 .../rpgregions/gui/DiscoveryGUI.java            | 13 +++++++++++--
 .../managers/data/region/ConfiguredRegion.java  | 17 ++++++++++++-----
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/RPGRegions.iml b/RPGRegions.iml
index 1381065..7913950 100644
--- a/RPGRegions.iml
+++ b/RPGRegions.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="RPGRegions" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="net.islandearth" external.system.module.version="1.0.5" type="JAVA_MODULE" version="4">
-  <component name="ExternalSystem" externalSystem="GRADLE" externalSystemModuleGroup="net.islandearth" externalSystemModuleVersion="1.1.7" linkedProjectId="RPGRegions" linkedProjectPath="$MODULE_DIR$" rootProjectPath="$MODULE_DIR$" />
+  <component name="ExternalSystem" externalSystem="GRADLE" externalSystemModuleGroup="net.islandearth" externalSystemModuleVersion="1.1.9" linkedProjectId="RPGRegions" linkedProjectPath="$MODULE_DIR$" rootProjectPath="$MODULE_DIR$" />
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/gui/DiscoveryGUI.java b/rpgregions/src/main/java/net/islandearth/rpgregions/gui/DiscoveryGUI.java
index 3b56a80..2094bb0 100644
--- a/rpgregions/src/main/java/net/islandearth/rpgregions/gui/DiscoveryGUI.java
+++ b/rpgregions/src/main/java/net/islandearth/rpgregions/gui/DiscoveryGUI.java
@@ -12,6 +12,7 @@ import net.islandearth.rpgregions.RPGRegions;
 import net.islandearth.rpgregions.managers.data.region.ConfiguredRegion;
 import net.islandearth.rpgregions.translation.Translations;
 import net.islandearth.rpgregions.utils.ItemStackBuilder;
+import net.islandearth.rpgregions.utils.StringUtils;
 import net.islandearth.rpgregions.utils.XMaterial;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -197,8 +198,11 @@ public class DiscoveryGUI extends RPGRegionsGUI {
 						? ChatColor.GRAY + "" + configuredRegion.getX() + ", " + configuredRegion.getZ()
 						: null;
 				List<String> translatedHint = new ArrayList<>();
+				if (configuredRegion.getHints() != null) {
+					configuredRegion.getHints().forEach(hint -> translatedHint.add(StringUtils.colour(hint)));
+				}
 				if (configuredRegion.getHint() != null) {
-					configuredRegion.getHint().forEach(hint -> translatedHint.add(ChatColor.translateAlternateColorCodes('&', hint)));
+					translatedHint.add(ChatColor.translateAlternateColorCodes('&', configuredRegion.getHint()));
 				}
 				List<String> hint = configuredRegion.isShowHint()
 						&& player.hasPermission("rpgregions.showhint")
@@ -210,10 +214,15 @@ public class DiscoveryGUI extends RPGRegionsGUI {
 						&& hasDiscovered
 						? Translations.TELEPORT.get(player)
 						: null;
+
+				List<String> translatedDiscoveredLore = new ArrayList<>();
+				if (configuredRegion.getDiscoveredLore() != null) {
+					configuredRegion.getDiscoveredLore().forEach(discoveredLore -> translatedDiscoveredLore.add(StringUtils.colour(discoveredLore)));
+				}
 				ItemStack item = hasDiscovered
 						?
 						new ItemStackBuilder(configuredRegion.getIcon())
-								.withLore(configuredRegion.getDiscoveredLore())
+								.withLore(translatedDiscoveredLore)
 								.build()
 						:
 						new ItemStackBuilder(configuredRegion.getUndiscoveredIcon())
diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/managers/data/region/ConfiguredRegion.java b/rpgregions/src/main/java/net/islandearth/rpgregions/managers/data/region/ConfiguredRegion.java
index a9533fa..5529b6a 100644
--- a/rpgregions/src/main/java/net/islandearth/rpgregions/managers/data/region/ConfiguredRegion.java
+++ b/rpgregions/src/main/java/net/islandearth/rpgregions/managers/data/region/ConfiguredRegion.java
@@ -37,7 +37,8 @@ public class ConfiguredRegion {
 	private int x;
 	private int y;
 	private int z;
-	private final List<String> hint;
+	@Deprecated private String hint;
+	private final List<String> hints;
 	private final boolean showHint;
 	private final boolean teleportable;
 	private final boolean hidden;
@@ -59,7 +60,7 @@ public class ConfiguredRegion {
 		this.x = x;
 		this.y = y;
 		this.z = z;
-		this.hint = new ArrayList<>();
+		this.hints = new ArrayList<>();
 		this.showHint = false;
 		this.teleportable = false;
 		this.hidden = false;
@@ -83,7 +84,7 @@ public class ConfiguredRegion {
 		this.x = x;
 		this.y = y;
 		this.z = z;
-		this.hint = new ArrayList<>();
+		this.hints = new ArrayList<>();
 		this.showHint = false;
 		this.teleportable = false;
 		this.hidden = false;
@@ -150,12 +151,18 @@ public class ConfiguredRegion {
 	public boolean isShowCoords() {
 		return showCoords;
 	}
-	
+
+	@Deprecated
 	@Nullable
-	public List<String> getHint() {
+	public String getHint() {
 		return hint;
 	}
 
+	@Nullable
+	public List<String> getHints() {
+		return hints;
+	}
+
 	public boolean isShowHint() {
 		return showHint;
 	}