Merge branch 'master' of https://github.com/TownyAdvanced/Towny.git

Author: LlmDl

Towny/pom.xml

@@ -32,7 +32,7 @@
     <properties>
         <project.bukkitAPIVersion>1.19</project.bukkitAPIVersion>
         <skipTests>true</skipTests>
-        <junit.version>6.0.2</junit.version>
+        <junit.version>6.0.3</junit.version>
     </properties>
 
     <scm>
@@ -222,6 +222,11 @@
             <version>4.98.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>fr.mrmicky</groupId>
+            <artifactId>fastboard</artifactId>
+            <version>2.1.5</version>
+        </dependency>
     </dependencies>
 
     <pluginRepositories>
@@ -350,6 +355,10 @@
                                 <pattern>solar.squares.pixelwidth</pattern>
                                 <shadedPattern>com.palmergames.bukkit.towny.libs.pixelwidth</shadedPattern>
                             </relocation>
+                            <relocation>
+                                <pattern>fr.mrmicky.fastboard</pattern>
+                                <shadedPattern>com.palmergames.fastboard</shadedPattern>
+                            </relocation>
                         </relocations>
                         <filters>
                             <filter>
@@ -394,7 +403,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.5.4</version>
+                    <version>3.5.5</version>
                     <configuration>
                         <skipTests>${skipTests}</skipTests>
                     </configuration>

Towny/src/main/java/com/palmergames/bukkit/towny/TownySettings.java

@@ -411,7 +411,8 @@ public static NationLevel getNationLevel(int levelNumber) {
 	}
 
 	public static NationLevel getNationLevel(Nation nation) {
-		return getNationLevel(nation.getLevelNumber());
+		int numResidents = getResidentCountForNationLevel(nation.getLevelNumber());
+		return getNationLevel(numResidents);
 	}
 
 	public static NationLevel getNationLevelWithModifier(int modifier) {
@@ -435,6 +436,21 @@ public static int getNationLevelFromGivenInt(int threshold) {
 		return 0;
 	}
 
+	/**
+	 * Gets the number of residents required to look up the NationLevel in the SortedMap.
+	 * @param level The number used to get the key from the keySet array. 
+	 * @return the number of residents which will get us the correct TownLevel in the NationLevel SortedMap.
+	 */
+	public static int getResidentCountForNationLevel(int level) {
+		Integer[] keys = configNationLevel.keySet().toArray(new Integer[] {});
+		// keys is always ordered from biggest to lowest (despite what the javadocs say
+		// about being sorted in Ascending order, this is not the case for a SortedMap.)
+		// We have to get it from lowest to largest.
+		Arrays.sort(keys);
+		level = Math.min(level, keys.length);
+		return keys[level];
+	}
+
 	public static int getNationLevelMax() {
 		return configNationLevel.size();
 	}

Towny/src/main/java/com/palmergames/bukkit/towny/command/TownyAdminCommand.java

@@ -193,7 +193,8 @@ public class TownyAdminCommand extends BaseCommand implements CommandExecutor {
 		"merge",
 		"transfer",
 		"forcemerge",
-		"recheck"
+		"recheck",
+		"setnationlevel"
 	);
 	private static final List<String> adminNationSetTabCompletes = Stream.concat(NationCommand.nationSetTabCompletes.stream(),
 		Stream.of("foundingdate")).collect(Collectors.toList());
@@ -587,6 +588,10 @@ else if (args.length == 6)
 										.map(Town::getName)
 										.collect(Collectors.toList()), args[4]);
 							break;
+						case "setnationlevel":
+							if (args.length == 4)
+								return NameUtil.filterByStart(StringMgmt.addToList(numbers, "unset"), args[3]);
+							break;
 						case "enemy":
 						case "ally":
 							if (args.length == 4)
@@ -1917,6 +1922,10 @@ public void parseAdminNationCommand(CommandSender sender, String[] split) throws
 			checkPermOrThrow(sender, PermissionNodes.TOWNY_COMMAND_TOWNYADMIN_NATION_ENEMY.getNode());
 			parseAdminNationEnemyCommand(sender, StringMgmt.remArgs(split, 2), nation);
 			break;
+		case "setnationlevel":
+			checkPermOrThrow(sender, PermissionNodes.TOWNY_COMMAND_TOWNYADMIN_NATION_SETNATIONLEVEL.getNode());
+			setNationLevel(sender, nation, StringMgmt.remArgs(split, 2));
+			break;
 		default:
 			if (TownyCommandAddonAPI.hasCommand(CommandType.TOWNYADMIN_NATION, split[1])) {
 				TownyCommandAddonAPI.getAddonCommand(CommandType.TOWNYADMIN_NATION, split[1]).execute(sender, split, nation);
@@ -1926,6 +1935,28 @@ public void parseAdminNationCommand(CommandSender sender, String[] split) throws
 		}
 	}
 
+	private void setNationLevel(CommandSender sender, Nation nation, String[] split) throws TownyException {
+		// The number is missing.
+		if (split.length == 0)
+			throw new TownyException("Eg: /townyadmin nation [nationname] setnationlevel 2");
+
+		// Handle un-setting the manual override.
+		if (split[0].equalsIgnoreCase("unset")) {
+			nation.setManualNationLevel(-1);
+			nation.save();
+			TownyMessaging.sendMsg(sender, Translatable.of("msg_nation_level_unset", nation, nation.getLevelNumber()));
+			return;
+		}
+
+		// Handle applying a manual override.
+		int level = MathUtil.getPositiveIntOrThrow(split[0]);
+		if (level > TownySettings.getNationLevelMax() - 1)
+			level = TownySettings.getNationLevelMax() - 1;
+		nation.setManualNationLevel(level);
+		nation.save();
+		TownyMessaging.sendMsg(sender, Translatable.of("msg_nation_level_overridden_with", nation, level));
+	}
+
 	private void parseAdminNewNationCommand(CommandSender sender, String[] split) throws TownyException {
 		if (split.length != 3)
 			throw new TownyException(Translatable.of("msg_err_not_enough_variables") + "/ta nation new [name] [capital]");

Towny/src/main/java/com/palmergames/bukkit/towny/db/SQLSchema.java

@@ -321,6 +321,7 @@ private static List<ColumnData> getNationColumns(){
 		columns.add(new ColumnData("conqueredTax", "float NOT NULL"));
 		columns.add(new ColumnData("sanctionedTowns", "mediumtext DEFAULT NULL"));
 		columns.add(new ColumnData("hasActiveWar", "bool NOT NULL DEFAULT '0'"));
+		columns.add(new ColumnData("manualNationLevel", "BIGINT DEFAULT '-1'"));
 		return columns;
 	}
 

Towny/src/main/java/com/palmergames/bukkit/towny/db/TownyFlatFileSource.java

@@ -1297,6 +1297,10 @@ public boolean loadNation(Nation nation) {
 				if (line != null)
 					nation.setActiveWar(Boolean.parseBoolean(line));
 
+				line = keys.get("manualNationLevel");
+				if (line != null)
+					nation.setManualNationLevel(Integer.parseInt(line));
+
 			} catch (Exception e) {
 				plugin.getLogger().log(Level.WARNING, Translation.of("flatfile_err_reading_nation_file_at_line", nation.getName(), line, nation.getName()), e);
 				return false;
@@ -2365,6 +2369,8 @@ public boolean saveNation(Nation nation) {
 		list.add("sanctionedTowns=" + StringMgmt.join(nation.getSanctionedTownsForSaving(), "#"));
 		// Active War
 		list.add("hasActiveWar=" + nation.hasActiveWar());
+
+		list.add("manualNationLevel=" + nation.getManualNationLevel());
 		/*
 		 *  Make sure we only save in async
 		 */

Towny/src/main/java/com/palmergames/bukkit/towny/db/TownySQLSource.java

@@ -1385,6 +1385,9 @@ private boolean loadNation(ResultSet rs) {
 			if (line != null && !line.isEmpty())
 				nation.setActiveWar(rs.getBoolean("hasActiveWar"));
 
+
+			nation.setManualNationLevel(rs.getInt("manualNationLevel"));
+			
 			return true;
 		} catch (SQLException e) {
 			TownyMessaging.sendErrorMsg("SQL: Load Nation " + name + " SQL Error - " + e.getMessage());
@@ -2497,6 +2500,7 @@ public synchronized boolean saveNation(Nation nation) {
 			nat_hm.put("maxPercentTaxAmount", nation.getMaxPercentTaxAmount());
 			nat_hm.put("spawnCost", nation.getSpawnCost());
 			nat_hm.put("neutral", nation.isNeutral());
+			nat_hm.put("manualNationLevel", nation.getManualNationLevel());
 
 			final Position spawnPos = nation.spawnPosition();
 			nat_hm.put("nationSpawn", spawnPos != null ? String.join("#", spawnPos.serialize()) : "");

Towny/src/main/java/com/palmergames/bukkit/towny/huds/HUDImplementer.java

@@ -0,0 +1,7 @@
+package com.palmergames.bukkit.towny.huds;
+
+import com.palmergames.bukkit.towny.huds.providers.HUD;
+
+public interface HUDImplementer {
+	public HUD getHUD();
+}