From 521742f1696eee7a36e5389dc55002082f2387fd Mon Sep 17 00:00:00 2001
From: LlmDl <llmdlio@gmail.com>
Date: Fri, 12 Dec 2025 17:24:54 -0600
Subject: [PATCH 1/3] Fix loading of provinces with bad home block entries.

---
 .../townyadvanced/townyprovinces/data/DataHandlerUtil.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/github/townyadvanced/townyprovinces/data/DataHandlerUtil.java b/src/main/java/io/github/townyadvanced/townyprovinces/data/DataHandlerUtil.java
index 870477d..81ec23c 100644
--- a/src/main/java/io/github/townyadvanced/townyprovinces/data/DataHandlerUtil.java
+++ b/src/main/java/io/github/townyadvanced/townyprovinces/data/DataHandlerUtil.java
@@ -90,7 +90,12 @@ private static void loadAllProvinces() {
 	public static void loadProvince(File provinceFile) {
 		//Read values from province file
 		Map<String,String> fileEntries = FileMgmt.loadFileIntoHashMap(provinceFile);
-		TPCoord homeBlock = unpackCoord(fileEntries.get("home_block"));
+		String homeblockEntry = fileEntries.get("home_block");
+		if (homeblockEntry == null) {
+			TownyProvinces.severe("Could not read home_block value in " + provinceFile.getPath().toString() + ", this province file will not be loaded.");
+			return;
+		}
+		TPCoord homeBlock = unpackCoord(homeblockEntry);
 		//Create province object
 		Province province = new Province(homeBlock);
 		//Read more values

From 60d220059a7690a740e880b88f13ab324fb9b753 Mon Sep 17 00:00:00 2001
From: LlmDl <llmdlio@gmail.com>
Date: Tue, 17 Feb 2026 14:15:08 -0600
Subject: [PATCH 2/3] Fix loading hashmaps.

---
 pom.xml                                       | 13 ++++-------
 .../townyprovinces/data/DataHandlerUtil.java  |  7 +++---
 .../townyprovinces/objects/Region.java        |  5 ++--
 .../townyprovinces/util/FileUtil.java         | 23 +++++++++++++++++++
 4 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 97a1270..70c79f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,14 +4,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.github.townyadvanced</groupId>
   <artifactId>TownyProvinces</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1</version>
   <name>townyprovinces</name> <!-- Leave lower-cased -->
 
   <properties>
     <java.version>1.16</java.version>
     <project.bukkitAPIVersion>1.15</project.bukkitAPIVersion>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <towny.version>0.101.2.5</towny.version>
+    <towny.version>0.102.0.0</towny.version>
   </properties>
 
   <repositories>
@@ -45,17 +45,12 @@
       <version>1.21.8-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
-<!--    <dependency>
+    <dependency>
       <groupId>com.palmergames.bukkit.towny</groupId>
       <artifactId>towny</artifactId>
       <version>${towny.version}</version>
       <scope>provided</scope>
-    </dependency>-->
-    <dependency>
-      <groupId>com.github.TownyAdvanced.Towny</groupId>
-      <artifactId>towny</artifactId>
-      <version>master-4907b3123a-1</version>
-	</dependency>
+    </dependency>
       <!--
       <dependency>
           <groupId>us.dynmap</groupId>
diff --git a/src/main/java/io/github/townyadvanced/townyprovinces/data/DataHandlerUtil.java b/src/main/java/io/github/townyadvanced/townyprovinces/data/DataHandlerUtil.java
index 81ec23c..e882505 100644
--- a/src/main/java/io/github/townyadvanced/townyprovinces/data/DataHandlerUtil.java
+++ b/src/main/java/io/github/townyadvanced/townyprovinces/data/DataHandlerUtil.java
@@ -1,6 +1,5 @@
 package io.github.townyadvanced.townyprovinces.data;
 
-import com.palmergames.util.FileMgmt;
 import io.github.townyadvanced.townyprovinces.TownyProvinces;
 import io.github.townyadvanced.townyprovinces.objects.Province;
 import io.github.townyadvanced.townyprovinces.objects.ProvinceType;
@@ -89,7 +88,7 @@ private static void loadAllProvinces() {
 
 	public static void loadProvince(File provinceFile) {
 		//Read values from province file
-		Map<String,String> fileEntries = FileMgmt.loadFileIntoHashMap(provinceFile);
+		Map<String,String> fileEntries = FileUtil.loadFileIntoHashMap(provinceFile);
 		String homeblockEntry = fileEntries.get("home_block");
 		if (homeblockEntry == null) {
 			TownyProvinces.severe("Could not read home_block value in " + provinceFile.getPath().toString() + ", this province file will not be loaded.");
@@ -154,8 +153,8 @@ private static Set<TPCoord> unpackCoords(String allCoordsAsString) {
 	
 	private static TPCoord unpackCoord(String coordAsString) {
 		String[] coordAsArray = coordAsString.split(",");
-		int x = Integer.parseInt(coordAsArray[0]);
-		int z = Integer.parseInt(coordAsArray[1]);
+		int x = Integer.parseInt(coordAsArray[0].trim());
+		int z = Integer.parseInt(coordAsArray[1].trim());
 		return new TPFinalCoord(x,z);
 	}
 
diff --git a/src/main/java/io/github/townyadvanced/townyprovinces/objects/Region.java b/src/main/java/io/github/townyadvanced/townyprovinces/objects/Region.java
index 828f1f1..e51f105 100644
--- a/src/main/java/io/github/townyadvanced/townyprovinces/objects/Region.java
+++ b/src/main/java/io/github/townyadvanced/townyprovinces/objects/Region.java
@@ -1,8 +1,9 @@
 package io.github.townyadvanced.townyprovinces.objects;
 
 import com.palmergames.bukkit.towny.object.Coord;
-import com.palmergames.util.FileMgmt;
 import io.github.townyadvanced.townyprovinces.settings.TownyProvincesSettings;
+import io.github.townyadvanced.townyprovinces.util.FileUtil;
+
 import org.bukkit.Location;
 
 import java.io.File;
@@ -36,7 +37,7 @@ public class Region {
 	private Set<Province> provinces; //Set of provinces. Assigned when required
 	
 	public Region(File regionDefinitionFile) {
-		Map<String, String> regionDefinitions = FileMgmt.loadFileIntoHashMap(regionDefinitionFile);
+		Map<String, String> regionDefinitions = FileUtil.loadFileIntoHashMap(regionDefinitionFile);
 		this.name = TownyProvincesSettings.getRegionName(regionDefinitions);
 		this.brushSquareRadiusInChunks = TownyProvincesSettings.getBrushSquareRadiusInChunks(regionDefinitions);
 		this.provinceSquareRadius = TownyProvincesSettings.calculateProvinceSquareRadius(regionDefinitions);
diff --git a/src/main/java/io/github/townyadvanced/townyprovinces/util/FileUtil.java b/src/main/java/io/github/townyadvanced/townyprovinces/util/FileUtil.java
index dad2d29..cfc2884 100644
--- a/src/main/java/io/github/townyadvanced/townyprovinces/util/FileUtil.java
+++ b/src/main/java/io/github/townyadvanced/townyprovinces/util/FileUtil.java
@@ -6,13 +6,18 @@
 import org.bukkit.Bukkit;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Properties;
 
 public class FileUtil {
 
@@ -72,6 +77,24 @@ public static void saveListIntoFile(List<String> linesToWrite, String filePath)
 		}
 	}
 
+	public static HashMap<String, String> loadFileIntoHashMap(File file) {
+
+		HashMap<String, String> keys = new HashMap<>();
+		try (FileInputStream fis = new FileInputStream(file);
+			 InputStreamReader isr = new InputStreamReader(fis, StandardCharsets.UTF_8)) {
+			Properties properties = new Properties();
+			properties.load(isr);
+			for (String key : properties.stringPropertyNames()) {
+				String value = properties.getProperty(key);
+				keys.put(key, String.valueOf(value));
+			}
+		} catch (IOException e) {
+			TownyProvinces.severe("An exception occurred while reading file " + file.getName());
+			e.printStackTrace();
+		}
+		return keys;
+	}
+	
 	public static List<File> readRegionDefinitionFiles() {
 		return readListOfFiles(REGION_DEFINITIONS_FOLDER_PATH);
 	}

From b1ce2ef97f9d2fcfffd48f5b38a7aa193766d068 Mon Sep 17 00:00:00 2001
From: LlmDl <llmdlio@gmail.com>
Date: Tue, 17 Feb 2026 14:21:49 -0600
Subject: [PATCH 3/3] Fix build.

---
 .../townyprovinces/util/FileUtil.java         | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/src/main/java/io/github/townyadvanced/townyprovinces/util/FileUtil.java b/src/main/java/io/github/townyadvanced/townyprovinces/util/FileUtil.java
index 5ad0e66..cfc2884 100644
--- a/src/main/java/io/github/townyadvanced/townyprovinces/util/FileUtil.java
+++ b/src/main/java/io/github/townyadvanced/townyprovinces/util/FileUtil.java
@@ -1,6 +1,5 @@
 package io.github.townyadvanced.townyprovinces.util;
 
-import com.palmergames.bukkit.towny.Towny;
 import com.palmergames.util.FileMgmt;
 import io.github.townyadvanced.townyprovinces.TownyProvinces;
 import io.github.townyadvanced.townyprovinces.messaging.Messaging;
@@ -148,22 +147,4 @@ public static boolean createRegionDefinitionsFolderAndSampleFiles() {
 			return false;
 		}
 	}
-
-	public static HashMap<String, String> loadFileIntoHashMap(File file) {
-
-		HashMap<String, String> keys = new HashMap<>();
-		try (FileInputStream fis = new FileInputStream(file);
-			InputStreamReader isr = new InputStreamReader(fis, StandardCharsets.UTF_8)) {
-			Properties properties = new Properties();
-			properties.load(isr);
-			for (String key : properties.stringPropertyNames()) {
-				String value = properties.getProperty(key);
-				keys.put(key, String.valueOf(value));
-			}
-		} catch (IOException e) {
-			Towny.getPlugin().getLogger().log(Level.WARNING, "An exception occurred while reading file " + file.getName(), e);
-		}
-		return keys;
-
-	}
 }