From f1cbae47b8cd511b11dc5f9c9b3e91028839f5e7 Mon Sep 17 00:00:00 2001
From: Cola <vaultslave@gmail.com>
Date: Wed, 30 Jun 2021 20:07:08 +0100
Subject: [PATCH 1/3] v1.2.0 - 1.17 & Java 16

---
 pom.xml                                       | 25 +++++++++++--------
 .../namecolors/NameColorSetting.java          | 10 ++++----
 .../biggestnerd/namecolors/NameColors.java    |  8 +++---
 src/main/resources/plugin.yml                 |  2 +-
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6e160d7..3e7faed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,15 +9,18 @@
     <version>1.0.0</version>
   </parent>
 
-	<groupId>com.biggestnerd.namecolors</groupId>
 	<artifactId>NameColors</artifactId>
-	<version>1.1.1</version>
+	<version>1.2.0</version>
 
 	<repositories>
 		<repository>
 			<id>civ-github-repo</id>
 			<url>https://raw.githubusercontent.com/CivClassic/artifacts/master/</url>
 		</repository>
+		<repository>
+			<id>papermc</id>
+			<url>https://papermc.io/repo/repository/maven-public/</url>
+		</repository>
 		<repository>
 			<id>jitpack.io</id>
 			<url>https://jitpack.io</url>
@@ -26,27 +29,27 @@
 	
 	<dependencies>
 		<dependency>
-			<groupId>com.destroystokyo.paper</groupId>
-			<artifactId>paper-api</artifactId>
-			<version>1.16.4-R0.1-SNAPSHOT</version>
+			<groupId>io.papermc.paper</groupId>
+			<artifactId>paper</artifactId>
+			<version>1.17-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>vg.civcraft.mc.civmodcore</groupId>
+			<groupId>com.github.civclassic</groupId>
 			<artifactId>CivModCore</artifactId>
-			<version>1.8.2</version>
+			<version>1.9.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>vg.civcraft.mc.civchat2</groupId>
+			<groupId>com.github.civclassic</groupId>
 			<artifactId>CivChat2</artifactId>
-			<version>1.8.1</version>
+			<version>1.9.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>vg.civcraft.mc.namelayer</groupId>
+			<groupId>com.github.civclassic</groupId>
 			<artifactId>NameLayer</artifactId>
-			<version>2.14.1</version>
+			<version>2.15.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<!-- TAB -->
diff --git a/src/main/java/com/biggestnerd/namecolors/NameColorSetting.java b/src/main/java/com/biggestnerd/namecolors/NameColorSetting.java
index 61e321e..d53e0ba 100644
--- a/src/main/java/com/biggestnerd/namecolors/NameColorSetting.java
+++ b/src/main/java/com/biggestnerd/namecolors/NameColorSetting.java
@@ -12,12 +12,12 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
+import vg.civcraft.mc.civmodcore.inventory.gui.Clickable;
+import vg.civcraft.mc.civmodcore.inventory.gui.IClickable;
+import vg.civcraft.mc.civmodcore.inventory.gui.MultiPageView;
 import vg.civcraft.mc.civmodcore.inventory.items.ItemUtils;
-import vg.civcraft.mc.civmodcore.inventorygui.Clickable;
-import vg.civcraft.mc.civmodcore.inventorygui.IClickable;
-import vg.civcraft.mc.civmodcore.inventorygui.MultiPageView;
-import vg.civcraft.mc.civmodcore.playersettings.PlayerSetting;
-import vg.civcraft.mc.civmodcore.playersettings.gui.MenuSection;
+import vg.civcraft.mc.civmodcore.players.settings.PlayerSetting;
+import vg.civcraft.mc.civmodcore.players.settings.gui.MenuSection;
 
 public class NameColorSetting extends PlayerSetting<ChatColor> {
 
diff --git a/src/main/java/com/biggestnerd/namecolors/NameColors.java b/src/main/java/com/biggestnerd/namecolors/NameColors.java
index c4a2b34..4578164 100644
--- a/src/main/java/com/biggestnerd/namecolors/NameColors.java
+++ b/src/main/java/com/biggestnerd/namecolors/NameColors.java
@@ -1,5 +1,8 @@
 package com.biggestnerd.namecolors;
 
+import static me.neznamy.tab.api.TABAPI.getPlayer;
+
+
 import me.neznamy.tab.api.EnumProperty;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -7,12 +10,9 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.scheduler.BukkitRunnable;
 import vg.civcraft.mc.civchat2.CivChat2;
 import vg.civcraft.mc.civmodcore.ACivMod;
-import vg.civcraft.mc.civmodcore.playersettings.PlayerSettingAPI;
-
-import static me.neznamy.tab.api.TABAPI.getPlayer;
+import vg.civcraft.mc.civmodcore.players.settings.PlayerSettingAPI;
 
 public class NameColors extends ACivMod implements Listener {
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 4b0e54f..670eb1b 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -5,7 +5,7 @@ authors: [biggestnerd, Maxopoly]
 depend: [CivModCore, CivChat2]
 softdepend:
   - TAB
-api-version: 1.14
+api-version: 1.17
 commands:
   namecolor:
     description: "Give your name a nice color!"

From 71d95691d2dc2263c9e405f3c6e0ccf05c274c76 Mon Sep 17 00:00:00 2001
From: Cola <vaultslave@gmail.com>
Date: Wed, 30 Jun 2021 21:57:47 +0100
Subject: [PATCH 2/3] POM fix

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3e7faed..df7322a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.civclassic</groupId>
     <artifactId>civclassic-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
   </parent>
 
 	<artifactId>NameColors</artifactId>

From 0780ac68e6b697d953501d140dd325b7e7eb0570 Mon Sep 17 00:00:00 2001
From: Cola <vaultslave@gmail.com>
Date: Mon, 19 Jul 2021 00:04:05 +0100
Subject: [PATCH 3/3] 1.17.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index df7322a..26209c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>io.papermc.paper</groupId>
 			<artifactId>paper</artifactId>
-			<version>1.17-R0.1-SNAPSHOT</version>
+			<version>1.17.1-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>