Economy Disabling and Dependency Update

build.xml

@@ -16,8 +16,7 @@
         <jar jarfile="${serverPath}\plugins\${ant.project.name}.jar" basedir="./target/classes/" includes="**/*">
 
 
-            <zipgroupfileset dir="${user.home}/.m2/repository/org/mineacademy/Foundation/${foundation.version}/"
-                             includes="**/*${foundation.version}.jar"/>
+            <zipgroupfileset dir="${user.home}/.m2/repository/com/github/kangarko/Foundation/${foundation.version}/" includes="**/*${foundation.version}.jar" />
 
             <!-- <fileset dir="../Foundation/target/classes" /> -->
         </jar>

pom.xml

@@ -1,23 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>net.tolmikarc</groupId>
     <artifactId>TownyMenu</artifactId>
-    <version>1.3.4</version>
+    <version>1.3.6</version>
 
 
     <properties>
 
         <main.class>net.tolmikarc.townymenu.TownyMenuPlugin</main.class>
 
-        <foundation.version>5.8.2</foundation.version>
+        <foundation.version>5.9.0</foundation.version>
 
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.release>11</maven.compiler.release>
     </properties>
 
     <repositories>
@@ -38,31 +41,25 @@
             <url>https://ci.ender.zone/plugin/repository/everything/</url>
         </repository>
     </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>apache.snapshots</id>
+            <url>https://repository.apache.org/snapshots/</url>
+        </pluginRepository>
+    </pluginRepositories>
 
     <dependencies>
 
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <version>1.17-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.mineacademy</groupId>
+            <groupId>com.github.kangarko</groupId>
             <artifactId>Foundation</artifactId>
             <version>${foundation.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.github.TownyAdvanced</groupId>
-            <artifactId>Towny</artifactId>
-            <version>0.96.7.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.12</version>
         </dependency>
     </dependencies>
     <build>
@@ -80,7 +77,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -93,9 +90,7 @@
                             <artifactSet>
                                 <includes>
                                     <include>org.mineacademy:Game*</include>
-                                    <include>org.mineacademy:Foundation*</include>
-                                    <include>com.palmergames.bukkit.towny:Towny*</include>
-                                    <include>com.github.TownyAdvanced*</include>
+                                    <include>com.github.kangarko:Foundation*</include>
                                 </includes>
                                 <excludes>
                                     <exclude>org.mineacademy:GameAPI*</exclude>

src/main/java/net/tolmikarc/townymenu/plot/command/PlotMenuCommand.java

@@ -26,12 +26,10 @@ protected void onCommand() {
 			return;
 		}
 
-		TownBlock townBlock;
-		Town town;
-		Resident resident = TownyAPI.getInstance().getDataSource().getResident(getPlayer().getName());
+		Resident resident = TownyAPI.getInstance().getResident(getPlayer().getName());
 		if (TownyAPI.getInstance().getTownBlock(getPlayer().getLocation()) != null) {
-			townBlock = TownyAPI.getInstance().getTownBlock(getPlayer().getLocation());
-			town = townBlock.getTown();
+			TownBlock townBlock = TownyAPI.getInstance().getTownBlock(getPlayer().getLocation());
+			Town town = townBlock.getTown();
 			if (town.getMayor().equals(resident) || getPlayer().hasPermission("townymenu.admin.plot"))
 				new PlotMenu(townBlock).displayTo(getPlayer());
 			else if (townBlock.hasResident() && townBlock.isOwner(resident)) {

src/main/java/net/tolmikarc/townymenu/settings/Settings.java

@@ -10,11 +10,13 @@ protected int getConfigVersion() {
 	}
 
 	public static String MONEY_SYMBOL;
+	public static Boolean ECONOMY_ENABLED;
 
 	private static void init() {
 		pathPrefix(null);
 
 		MONEY_SYMBOL = getString("Money_Symbol");
+		ECONOMY_ENABLED = getBoolean("Economy");
 
 
 	}