Moving things back to the Core

After hours of trying to rebase the commits to a31c353,
I decided that it's not that significant anyways.

jitpack.yml

@@ -5,6 +5,6 @@ jdk:
 install:
    - echo "Downloading Towny JAR..."
    - 'wget -O "Towny.jar" --header="Accept-Language: en-us,en;q=0.5" http://palmergames.com/file-repo/Towny%20Advanced/Development/0.91.1.5/Towny.jar'
-   - mvn install:install-file -Dfile=Towny.jar -DgroupId=com.github.TBMCPlugins.ButtonLib -DartifactId=Towny -Dversion=master-SNAPSHOT -Dpackaging=jar
+   - mvn install:install-file -Dfile=Towny.jar -DgroupId=com.github.TBMCPlugins.ButtonCore -DartifactId=Towny -Dversion=master-SNAPSHOT -Dpackaging=jar
    - mvn clean install -DskipTests 
 #   - rm -r ~/.m2/repository/com/palmergames/Towny/

pom.xml

@@ -36,7 +36,7 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
-			<plugin>
+			<!-- <plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
 				<version>2.4.2</version>
@@ -60,7 +60,7 @@
 						</configuration>
 					</execution>
 				</executions>
-			</plugin>
+			</plugin> -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>

src/main/java/buttondevteam/lib/EventExceptionHandler.java

@@ -1,3 +1,4 @@
+
 package buttondevteam.lib;
 
 import java.lang.reflect.Method;

src/main/java/buttondevteam/lib/TBMCCoreAPI.java

@@ -44,8 +44,9 @@ public final class TBMCCoreAPI {
 		String ret = "";
 		URL url;
 		try {
-			url = new URL("https://jitpack.io/com/github/TBMCPlugins/" + correctname + "/master-SNAPSHOT/" + correctname
-					+ "-master-SNAPSHOT.jar"); // ButtonLib exception not required, not a separate plugin
+			url = new URL("https://jitpack.io/com/github/TBMCPlugins/"
+					+ (correctname.equals("ButtonCore") ? "ButtonCore/ButtonCore" : correctname) + "/master-SNAPSHOT/"
+					+ correctname + "-master-SNAPSHOT.jar"); // ButtonCore exception required since it hosts Towny as well
 			FileUtils.copyURLToFile(url, new File("plugins/" + correctname + ".jar"));
 		} catch (FileNotFoundException e) {
 			ret = "Can't find JAR, the build probably failed. Build log (scroll to bottom):\nhttps://jitpack.io/com/github/TBMCPlugins/"
@@ -96,4 +97,4 @@ public final class TBMCCoreAPI {
 		Bukkit.getLogger().warning(sourcemsg);
 		e.printStackTrace();
 	}
-}
+}

src/main/java/buttondevteam/lib/TBMCPlayer.java

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 package buttondevteam.lib;
 
 import java.io.File;
@@ -462,4 +463,4 @@ public class TBMCPlayer implements AutoCloseable {
 	public enum InfoTarget {
 		MCHover, MCCommand, Discord
 	}
-}
+}

src/main/java/buttondevteam/lib/TBMCPlayerAddEvent.java

@@ -33,4 +33,4 @@ public class TBMCPlayerAddEvent extends Event {
 	public static HandlerList getHandlerList() {
 		return handlers;
 	}
-}
+}

src/main/java/buttondevteam/lib/TBMCPlayerJoinEvent.java

@@ -24,4 +24,4 @@ public class TBMCPlayerJoinEvent extends Event {
 	public static HandlerList getHandlerList() {
 		return handlers;
 	}
-}
+}

src/main/java/buttondevteam/lib/TBMCPlayerLoadEvent.java

@@ -31,4 +31,4 @@ public class TBMCPlayerLoadEvent extends Event {
 	public static HandlerList getHandlerList() {
 		return handlers;
 	}
-}
+}

src/main/java/buttondevteam/lib/TBMCPlayerQuitEvent.java

@@ -24,4 +24,4 @@ public class TBMCPlayerQuitEvent extends Event {
 	public static HandlerList getHandlerList() {
 		return handlers;
 	}
-}
+}

src/main/java/buttondevteam/lib/TBMCPlayerSaveEvent.java

@@ -31,4 +31,4 @@ public class TBMCPlayerSaveEvent extends Event {
 	public static HandlerList getHandlerList() {
 		return handlers;
 	}
-}
+}