From 43aefc0639a483b9a174eb0b014fa3e9d13dd424 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Wed, 2 Nov 2016 14:48:40 +0100 Subject: [PATCH] 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 | 2 +- pom.xml | 4 ++-- src/main/java/buttondevteam/lib/EventExceptionHandler.java | 1 + src/main/java/buttondevteam/lib/TBMCCoreAPI.java | 7 ++++--- src/main/java/buttondevteam/lib/TBMCPlayer.java | 3 ++- src/main/java/buttondevteam/lib/TBMCPlayerAddEvent.java | 2 +- src/main/java/buttondevteam/lib/TBMCPlayerJoinEvent.java | 2 +- src/main/java/buttondevteam/lib/TBMCPlayerLoadEvent.java | 2 +- src/main/java/buttondevteam/lib/TBMCPlayerQuitEvent.java | 2 +- src/main/java/buttondevteam/lib/TBMCPlayerSaveEvent.java | 2 +- 10 files changed, 15 insertions(+), 12 deletions(-) diff --git a/jitpack.yml b/jitpack.yml index a94b9fc..219eab8 100644 --- a/jitpack.yml +++ b/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/ \ No newline at end of file diff --git a/pom.xml b/pom.xml index 82b1ab7..a5c3e01 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 1.8 - + org.apache.maven.plugins maven-resources-plugin diff --git a/src/main/java/buttondevteam/lib/EventExceptionHandler.java b/src/main/java/buttondevteam/lib/EventExceptionHandler.java index e2d1b44..11ebc8f 100644 --- a/src/main/java/buttondevteam/lib/EventExceptionHandler.java +++ b/src/main/java/buttondevteam/lib/EventExceptionHandler.java @@ -1,3 +1,4 @@ + package buttondevteam.lib; import java.lang.reflect.Method; diff --git a/src/main/java/buttondevteam/lib/TBMCCoreAPI.java b/src/main/java/buttondevteam/lib/TBMCCoreAPI.java index 0fef393..8293b0a 100644 --- a/src/main/java/buttondevteam/lib/TBMCCoreAPI.java +++ b/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(); } -} +} \ No newline at end of file diff --git a/src/main/java/buttondevteam/lib/TBMCPlayer.java b/src/main/java/buttondevteam/lib/TBMCPlayer.java index c5e5e7c..677d1b9 100644 --- a/src/main/java/buttondevteam/lib/TBMCPlayer.java +++ b/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 } -} +} \ No newline at end of file diff --git a/src/main/java/buttondevteam/lib/TBMCPlayerAddEvent.java b/src/main/java/buttondevteam/lib/TBMCPlayerAddEvent.java index 2a975dc..46ccb4f 100644 --- a/src/main/java/buttondevteam/lib/TBMCPlayerAddEvent.java +++ b/src/main/java/buttondevteam/lib/TBMCPlayerAddEvent.java @@ -33,4 +33,4 @@ public class TBMCPlayerAddEvent extends Event { public static HandlerList getHandlerList() { return handlers; } -} +} \ No newline at end of file diff --git a/src/main/java/buttondevteam/lib/TBMCPlayerJoinEvent.java b/src/main/java/buttondevteam/lib/TBMCPlayerJoinEvent.java index 1cce842..499f8b1 100644 --- a/src/main/java/buttondevteam/lib/TBMCPlayerJoinEvent.java +++ b/src/main/java/buttondevteam/lib/TBMCPlayerJoinEvent.java @@ -24,4 +24,4 @@ public class TBMCPlayerJoinEvent extends Event { public static HandlerList getHandlerList() { return handlers; } -} +} \ No newline at end of file diff --git a/src/main/java/buttondevteam/lib/TBMCPlayerLoadEvent.java b/src/main/java/buttondevteam/lib/TBMCPlayerLoadEvent.java index 08c6a3d..71d35a6 100644 --- a/src/main/java/buttondevteam/lib/TBMCPlayerLoadEvent.java +++ b/src/main/java/buttondevteam/lib/TBMCPlayerLoadEvent.java @@ -31,4 +31,4 @@ public class TBMCPlayerLoadEvent extends Event { public static HandlerList getHandlerList() { return handlers; } -} +} \ No newline at end of file diff --git a/src/main/java/buttondevteam/lib/TBMCPlayerQuitEvent.java b/src/main/java/buttondevteam/lib/TBMCPlayerQuitEvent.java index 90bd4f7..5883365 100644 --- a/src/main/java/buttondevteam/lib/TBMCPlayerQuitEvent.java +++ b/src/main/java/buttondevteam/lib/TBMCPlayerQuitEvent.java @@ -24,4 +24,4 @@ public class TBMCPlayerQuitEvent extends Event { public static HandlerList getHandlerList() { return handlers; } -} +} \ No newline at end of file diff --git a/src/main/java/buttondevteam/lib/TBMCPlayerSaveEvent.java b/src/main/java/buttondevteam/lib/TBMCPlayerSaveEvent.java index 931c4c1..f538641 100644 --- a/src/main/java/buttondevteam/lib/TBMCPlayerSaveEvent.java +++ b/src/main/java/buttondevteam/lib/TBMCPlayerSaveEvent.java @@ -31,4 +31,4 @@ public class TBMCPlayerSaveEvent extends Event { public static HandlerList getHandlerList() { return handlers; } -} +} \ No newline at end of file