* Fixed all misc clans pro labeling needing resolved.

README.md

@@ -3,4 +3,4 @@ An alternative to factions with unique features, modern version support and chun
 ##### LABYRINTH BUILT.
 NEW VERSION SOON
 
-[Click here for wiki](https://github.com/the-h-team/ClansPro/wiki)
+[Click here for wiki](https://github.com/the-h-team/Clans/wiki)

api/pom.xml

@@ -3,9 +3,9 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>ClansPro</artifactId>
+        <artifactId>Clans</artifactId>
         <groupId>com.github.the-h-team</groupId>
-        <version>1.5.1</version>
+        <version>1.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

cli/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>ClansPro</artifactId>
+        <artifactId>Clans</artifactId>
         <groupId>com.github.the-h-team</groupId>
         <version>1.5.1</version>
     </parent>

pom.xml

@@ -4,16 +4,16 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.github.sanctum</groupId>
-    <artifactId>ClansPro</artifactId>
-    <version>1.5.1</version>
+    <artifactId>Clans</artifactId>
+    <version>1.6.0</version>
     <modules>
         <module>tether-api</module>
         <module>tether-cli</module>
     </modules>
     <packaging>pom</packaging>
 
     <name>Tether</name>
-    <url>https://github.com/the-h-team/ClansPro</url>
+    <url>https://github.com/the-h-team/Clans</url>
 
     <organization>
         <name>Sanctum</name>

src/main/java/com/github/sanctum/clans/ClansJavaPlugin.java

@@ -133,7 +133,7 @@ void fixDataFolder() {
 		final String name = getDescription().getName();
 		final File newDir = new File(pluginsDir.getParentFile().getPath(), name);
 		// account for both folder names
-		for (String oldFolderName : new String[]{"ClansPro", "Tether"}) {
+		for (String oldFolderName : new String[]{"Clans", "Tether"}) {
 			final File oldDir = new File(pluginsDir.getParentFile().getPath(), oldFolderName);
 			if (oldDir.renameTo(newDir)) {
 				getLogger().info("Renamed the old '" + oldFolderName + "' folder to '" + name + "' for you.");
@@ -240,9 +240,7 @@ public void onDisable() {
 		});
 
 		FileManager heads = getFileList().get("heads", "Configuration/Data", Configurable.Type.JSON);
-		// FIXME change to "Clans"
-		// -not doing change right now so i don't break anything
-		CustomHead.Manager.getHeads().stream().filter(h -> h.category().equals("ClansPro")).forEach(h -> {
+		CustomHead.Manager.getHeads().stream().filter(h -> h.category().equals("Clans")).forEach(h -> {
 			heads.write(t -> {
 				t.set(h.name() + ".name", h.name());
 				t.set(h.name() + ".custom", true);

src/main/java/com/github/sanctum/clans/bridge/ClanAddonQueue.java

@@ -120,9 +120,7 @@ public boolean load(@NotNull Object o) {
 			}
 		};
 		if (!attempt.load(addon)) {
-			// FIXME start with "Clans::"
-			// -not doing change right now so i don't break anything
-			String key = "ClansPro::" + addon.getName() + ";enable-attempt";
+			String key = "Clans::" + addon.getName() + ";enable-attempt";
 			if (TaskMonitor.getLocalInstance().get(key) == null) {
 				Task t = new Task(key, Task.REPEATABLE, TaskChain.getSynchronous()) {
 
@@ -433,9 +431,7 @@ public boolean load(@NotNull Object o) {
 			}
 		};
 		if (!attempt.load(e)) {
-			// FIXME start with "Clans::"
-			// -not doing change right now so i don't break anything
-			String key = "ClansPro::" + e.getName() + ";enable-attempt";
+			String key = "Clans::" + e.getName() + ";enable-attempt";
 			if (TaskMonitor.getLocalInstance().get(key) == null) {
 				Task t = new Task(key, Task.REPEATABLE, TaskChain.getSynchronous()) {
 

src/main/java/com/github/sanctum/clans/bridge/external/DynmapAddon.java

@@ -51,9 +51,7 @@ public void onLoad() {
 	@Override
 	public void onEnable() {
 
-		// FIXME start with "clans;"
-		// -not doing change right now so i don't break anything
-		ClanVentBus.MEDIUM_PRIORITY.subscribeTo(CommandInformationAdaptEvent.class, "clanspro;dynmap-info_adapt", (e, subscription) -> {
+		ClanVentBus.MEDIUM_PRIORITY.subscribeTo(CommandInformationAdaptEvent.class, "clans;dynmap-info_adapt", (e, subscription) -> {
 			ClanAddon cycle = ClanAddonQueue.getInstance().get("Dynmap");
 
 			if (cycle != null && !cycle.getContext().isActive()) {
@@ -65,15 +63,11 @@ public void onEnable() {
 			e.insert("&7|&e) &6/c &bglobe &chide &8[all]");
 		}).queue();
 
-		// FIXME start with "clans;"
-		// -not doing change right now so i don't break anything
-		ClanVentBus.MEDIUM_PRIORITY.subscribeTo(AssociateObtainLandEvent.class, "clanspro;dynmap-land_obtain", (event, subscription) -> {
+		ClanVentBus.MEDIUM_PRIORITY.subscribeTo(AssociateObtainLandEvent.class, "clans;dynmap-land_obtain", (event, subscription) -> {
 			event.getPlayer().performCommand("c globe show");
 		}).queue();
 
-		// FIXME start with "clans;"
-		// -not doing change right now so i don't break anything
-		ClanVentBus.HIGHEST_PRIORITY.subscribeTo(AssociateUnClaimEvent.class, "clanspro;dynmap-land_loss", (event, subscription) -> {
+		ClanVentBus.HIGHEST_PRIORITY.subscribeTo(AssociateUnClaimEvent.class, "clans;dynmap-land_loss", (event, subscription) -> {
 			if (!event.isCancelled()) {
 				event.getPlayer().performCommand("c globe hide");
 			}
@@ -85,11 +79,9 @@ public void onEnable() {
 	public void onDisable() {
 
 		ClanVentBus mediumPriority = ClanVentBus.MEDIUM_PRIORITY;
-		// FIXME start with "clans;" x3 lines
-		// -not doing change right now so i don't break anything
-		mediumPriority.unsubscribeFrom(CommandInformationAdaptEvent.class, "clanspro;dynmap-info_adapt").deploy();
-		mediumPriority.unsubscribeFrom(CommandInformationAdaptEvent.class, "clanspro;dynmap-land_obtain").deploy();
-		mediumPriority.unsubscribeFrom(CommandInformationAdaptEvent.class, "clanspro;dynmap-land_loss").deploy();
+		mediumPriority.unsubscribeFrom(CommandInformationAdaptEvent.class, "clans;dynmap-info_adapt").deploy();
+		mediumPriority.unsubscribeFrom(CommandInformationAdaptEvent.class, "clans;dynmap-land_obtain").deploy();
+		mediumPriority.unsubscribeFrom(CommandInformationAdaptEvent.class, "clans;dynmap-land_loss").deploy();
 
 
 	}

src/main/java/com/github/sanctum/clans/bridge/internal/kingdoms/command/KingdomCommand.java

@@ -55,7 +55,6 @@ public static String getProgressBar(int currentValue, int maxValue, int maxBars)
 	public boolean player(Player p, String label, String[] args) {
 
 		if (args.length == 0) {
-			// TODO: send help menu
 			Clan.Associate associate = ClansAPI.getInstance().getAssociate(p).orElse(null);
 			message()
 					.append(text(" "))
@@ -223,7 +222,6 @@ public boolean player(Player p, String label, String[] args) {
 						Clan.ACTION.sendMessage(p, "&cYour clan is no longer a member of the kingdom.");
 
 						if (k.getMembers().size() == 0) {
-							// TODO: announce kingdom fallen
 							k.remove(ClanAddonQueue.getInstance().get("Kingdoms"));
 							Bukkit.getOnlinePlayers().forEach(pl -> Clan.ACTION.sendMessage(pl, "&2[&b" + k.getName() + "&2]&r &c&ohas fallen.."));
 						}

src/main/java/com/github/sanctum/clans/commands/CommandClanAdmin.java

@@ -44,9 +44,7 @@ public CommandClanAdmin() {
 		super("clansadmin");
 		setDescription("Used to modify clan settings.");
 		setAliases(Arrays.asList("ca", "cla", "clanadmin"));
-		// FIXME start with "clans" and/or make relative/calculated?
-		// -not doing change right now so i don't break anything
-		setPermission("clanspro.admin");
+		setPermission("clans.admin");
 	}
 
 	private List<String> helpMenu(String label) {

src/main/java/com/github/sanctum/clans/commands/CommandHead.java

@@ -118,9 +118,7 @@ public boolean player(Player p, String label, String[] args) {
 
 									@Override
 									public @NotNull String category() {
-										// FIXME change to "Clans"
-										// -not doing change right now so i don't break anything
-										return "ClansPro";
+										return "Clans";
 									}
 								});
 								sendMessage(p, MessageFormat.format(ClansAPI.getDataInstance().getMessageResponse("cached-head"), cost));
@@ -149,9 +147,7 @@ public boolean player(Player p, String label, String[] args) {
 
 						@Override
 						public @NotNull String category() {
-							// FIXME change to "Clans"
-							// -not doing change right now so i don't break anything
-							return "ClansPro";
+							return "Clans";
 						}
 					});
 					sendMessage(p, MessageFormat.format(ClansAPI.getDataInstance().getMessageResponse("cached-head"), 0.0));

src/main/java/com/github/sanctum/clans/construct/ClanManager.java

@@ -162,9 +162,7 @@ public synchronized boolean delete(Clan c) {
 				if (!m.getRoot().delete()) {
 					ClansAPI.getInstance().getPlugin().getLogger().warning("- A non existent clan file was attempted to be removed, ignoring...");
 				}
-			}).scheduleLater("ClansPro-removal;" + c.getId(), 1L);
-			// ^FIXME change key to start with "Clans"
-			// -not doing change right now so i don't break anything
+			}).scheduleLater("Clans-removal;" + c.getId(), 1L);
 			return CLANS.remove(c);
 		} catch (Exception e) {
 			return false;

src/main/java/com/github/sanctum/clans/construct/api/ClaimActionEngine.java

@@ -524,15 +524,11 @@ public int getPlayerHardcap(Player player) {
 		if (player == null)
 			return 0;
 		for (int i = 1; i < 251; i++) {
-			// FIXME start with "clans"/make relative/calculated
-			// -not doing change right now so i don't break anything
-			if (player.hasPermission("clanspro." + DataManager.Security.getPermission("claim") + ".infinite")) {
+			if (player.hasPermission("clans." + DataManager.Security.getPermission("claim") + ".infinite")) {
 				result = -1;
 				break;
 			}
-			// FIXME start with "clans"/make relative/calculated
-			// -not doing change right now so i don't break anything
-			if (player.hasPermission("clanspro." + DataManager.Security.getPermission("claim") + "." + i)) {
+			if (player.hasPermission("clans." + DataManager.Security.getPermission("claim") + "." + i)) {
 				result = i;
 				break;
 			}

src/main/java/com/github/sanctum/clans/construct/api/ClanActionEngine.java

@@ -182,9 +182,7 @@ public Clan.Action<Clan> remove(@NotNull UUID target, boolean silent) {
 							Bukkit.broadcastMessage(color(getPrefix() + " " + format));
 						}
 						API.getClaimManager().refresh();
-					}).scheduleLater("ClansPro-deletion;" + target, 1);
-					// ^FIXME change key to start with "Clans"
-					// -not doing change right now so i don't break anything
+					}).scheduleLater("Clans-deletion;" + target, 1);
 				} else {
 					if (!silent) {
 						clanIndex.broadcast(MessageFormat.format(ClansAPI.getDataInstance().getMessageResponse("member-leave"), Bukkit.getOfflinePlayer(target).getName()));

src/main/java/com/github/sanctum/clans/construct/api/ClansAPI.java

@@ -38,15 +38,13 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-// FIXME update ascii art
 /**
  * <pre>
- *    ████████╗███████╗████████╗██╗  ██╗███████╗██████╗
- *    ╚══██╔══╝██╔════╝╚══██╔══╝██║  ██║██╔════╝██╔══██╗
- *       ██║   █████╗     ██║   ███████║█████╗  ██████╔╝
- *       ██║   ██╔══╝     ██║   ██╔══██║██╔══╝  ██╔══██╗
- *       ██║   ███████╗   ██║   ██║  ██║███████╗██║  ██║
- *       ╚═╝   ╚══════╝   ╚═╝   ╚═╝  ╚═╝╚══════╝╚═╝  ╚═╝
+ *   ██████ ██       █████  ███    ██ ███████
+ *  ██      ██      ██   ██ ████   ██ ██
+ *  ██      ██      ███████ ██ ██  ██ ███████
+ *  ██      ██      ██   ██ ██  ██ ██      ██
+ *   ██████ ███████ ██   ██ ██   ████ ███████
  * <pre>
  * Copyright (c) 2023 Sanctum
  */
@@ -112,7 +110,7 @@ static DataManager getDataInstance() {
 	Optional<Clan.Associate> getAssociate(String playerName);
 
 	/**
-	 * Get the ClansPro file listing.
+	 * Get the Clans file listing.
 	 *
 	 * @return Get's the file collection for the given plugin.
 	 */