From 04c2287e7d47db44c5301d8121140ddd36a8e6dd Mon Sep 17 00:00:00 2001
From: Ryan Wild <ryan-a-wild@protonmail.com>
Date: Sun, 14 Oct 2018 23:02:26 +0200
Subject: [PATCH 1/3] POM Version updates & General fixes to resolve build

Swithed over to using TF-WorldEdit from Telesphoreo while we get the official repo up to date which also allowed some technical debt to be cleaned up. Fixed other build issues in the process.
---
 nb-configuration.xml                          |  1 -
 pom.xml                                       | 45 ++++++++++++++-----
 .../bridge/WorldEditListener.java             | 13 ++----
 .../util/DepreciationAggregator.java          |  2 +-
 4 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/nb-configuration.xml b/nb-configuration.xml
index c64a9a2..35e184b 100644
--- a/nb-configuration.xml
+++ b/nb-configuration.xml
@@ -14,6 +14,5 @@
         Any value defined here will override the pom.xml file value but is only applicable to the current project.
         -->
         <netbeans.checkstyle.format>true</netbeans.checkstyle.format>
-        <netbeans.hint.jdkPlatform>JDK_1.8</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>
diff --git a/pom.xml b/pom.xml
index 703906c..53bfefa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,21 +43,42 @@
     </scm>
 
     <repositories>
-        <repository>
-            <id>ess-repo</id>
-            <url>http://repo.ess3.net</url>
-        </repository>
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
+        
+        <repository>
+            <id>ess-repo</id>
+            <url>http://repo.ess3.net/content/groups/essentials</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+
         <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
         </repository>
+        
         <repository>
             <id>sk89q-snapshots</id>
             <url>http://maven.sk89q.com/artifactory/repo</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
         </repository>
     </repositories>
 
@@ -83,7 +104,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.12-pre5-SNAPSHOT</version>
+            <version>1.12.2-R0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
@@ -104,19 +125,21 @@
             <artifactId>Essentials</artifactId>
             <version>2.13.1</version>
         </dependency>
-
+        
+        <!-- The following have been changed to Telesphoreo's personal repo as it is the most stable current TF-WorldEdit build. These will be changed to a TotalFreedom build in the future -->
+        
         <dependency>
-            <groupId>com.github.TotalFreedom.TF-WorldEdit</groupId>
+            <groupId>com.github.Telesphoreo.TF-WorldEdit</groupId>
             <artifactId>worldedit-bukkit</artifactId>
-            <version>6.1.0-TF</version>
+            <version>7.0.0-TF-SNAPSHOT-R0.2</version>
         </dependency>
 
         <dependency>
-            <groupId>com.github.TotalFreedom.TF-WorldEdit</groupId>
+            <groupId>com.github.Telesphoreo.TF-WorldEdit</groupId>
             <artifactId>worldedit-core</artifactId>
-            <version>6.1.0-TF</version>
+            <version>7.0.0-TF-SNAPSHOT-R0.2</version>
         </dependency>
-
+        
     </dependencies>
 
     <build>
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java
index ecf398d..67d5ddd 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java
@@ -2,16 +2,9 @@ package me.totalfreedom.totalfreedommod.bridge;
 
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-// These imports are not in the latest releases of WorldEdit, and the new versions of WorldEdit do not build properly. This will need to be reverted once the new WorldEdit builds are building properly.
-//
-//import me.totalfreedom.worldedit.LimitChangedEvent;
-//import me.totalfreedom.worldedit.SelectionChangedEvent;
-//
-//The following two imports are a temporary measure as mentioned above.
-//
-import me.StevenLawson.worldedit.LimitChangedEvent;
-import me.StevenLawson.worldedit.SelectionChangedEvent;
-//
+import me.totalfreedom.worldedit.LimitChangedEvent;
+import me.totalfreedom.worldedit.SelectionChangedEvent;
+
 import net.pravian.aero.component.PluginListener;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/util/DepreciationAggregator.java b/src/main/java/me/totalfreedom/totalfreedommod/util/DepreciationAggregator.java
index a404dea..52da7eb 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/util/DepreciationAggregator.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/util/DepreciationAggregator.java
@@ -13,7 +13,7 @@ import org.bukkit.material.MaterialData;
 public class DepreciationAggregator
 {
 
-    public static Block getTargetBlock(LivingEntity entity, HashSet<Byte> transparent, int maxDistance)
+    public static Block getTargetBlock(LivingEntity entity, HashSet<Material> transparent, int maxDistance)
     {
         return entity.getTargetBlock(transparent, maxDistance);
     }

From 7a7b332a6d6a38cdd30203477aa845f4ddb54716 Mon Sep 17 00:00:00 2001
From: Ryan Wild <ryan-a-wild@protonmail.com>
Date: Mon, 15 Oct 2018 15:38:43 +0200
Subject: [PATCH 2/3] Removed extra whitespace from POM

---
 pom.xml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 53bfefa..15371cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,6 @@
         <tfm.build.author>${buildAuthor}</tfm.build.author>
         <tfm.build.head>${buildHead}</tfm.build.head>
         <jar.finalName>${project.name}</jar.finalName>
-        
         <maven.build.timestamp.format>dd/MM/yyyy hh:mm aa</maven.build.timestamp.format>
     </properties>
 
@@ -47,7 +46,7 @@
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
-        
+
         <repository>
             <id>ess-repo</id>
             <url>http://repo.ess3.net/content/groups/essentials</url>
@@ -69,7 +68,7 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
-        
+
         <repository>
             <id>sk89q-snapshots</id>
             <url>http://maven.sk89q.com/artifactory/repo</url>
@@ -125,9 +124,9 @@
             <artifactId>Essentials</artifactId>
             <version>2.13.1</version>
         </dependency>
-        
+ 
         <!-- The following have been changed to Telesphoreo's personal repo as it is the most stable current TF-WorldEdit build. These will be changed to a TotalFreedom build in the future -->
-        
+ 
         <dependency>
             <groupId>com.github.Telesphoreo.TF-WorldEdit</groupId>
             <artifactId>worldedit-bukkit</artifactId>
@@ -139,7 +138,7 @@
             <artifactId>worldedit-core</artifactId>
             <version>7.0.0-TF-SNAPSHOT-R0.2</version>
         </dependency>
-        
+
     </dependencies>
 
     <build>
@@ -151,7 +150,6 @@
             </resource>
         </resources>
 
-
         <plugins>
             <!-- Compiler -->
             <plugin>
@@ -189,7 +187,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <!-- Antrun -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -215,7 +213,6 @@
                 </executions>
                
             </plugin>
-            
 
             <!-- Properties -->
             <plugin>

From 7af9e8b61e2dc8b72f81d8f2ba3aecbd85868487 Mon Sep 17 00:00:00 2001
From: Ryan Wild <ryan-a-wild@protonmail.com>
Date: Mon, 15 Oct 2018 19:23:39 +0200
Subject: [PATCH 3/3] Switched branch back to devel

The 1.12 branch updated the readme, just rolling it back.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 42a9f08..c78f296 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # TotalFreedomMod #
 
 
-[![Build Status](https://travis-ci.org/TotalFreedom/TotalFreedomMod.svg?branch=TFM1.12-Alpha)](https://travis-ci.org/TotalFreedom/TotalFreedomMod)
+[![Build Status](https://travis-ci.org/TotalFreedom/TotalFreedomMod.svg?branch=devel)](https://travis-ci.org/TotalFreedom/TotalFreedomMod)
 
 TotalFreedomMod is a CraftBukkit server plugin designed primarily to support the [Official TotalFreedom Minecraft Server](http://totalfreedom.me/). However, you are more than welcome to adapt the source for your own server.