From dea1a46f55f85d59b0ad1e4544cfa0844d819425 Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Wed, 6 Nov 2019 15:46:59 +0100
Subject: [PATCH] Check if Essentials is present

#77
---
 .idea/compiler.xml                            | 26 +++++++++++++------
 .../java/buttondevteam/core/MainPlugin.java   |  4 ++-
 .../core/component/spawn/SpawnComponent.java  | 10 ++++---
 ButtonCore/src/main/resources/plugin.yml      |  5 ++--
 CorePOM/CorePOM.iml                           |  2 ++
 CorePOM/pom.xml                               | 10 -------
 6 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index d2dfceb..863d6fa 100755
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -9,16 +9,28 @@
         <outputRelativeToContentRoot value="true" />
         <processorPath useClasspath="false">
           <entry name="$PROJECT_DIR$/ButtonProcessor/target/classes" />
-          <entry name="$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.21/snakeyaml-1.21.jar" />
           <entry name="$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.12.2-R0.1-SNAPSHOT/spigot-api-1.12.2-R0.1-20180712.012057-156.jar" />
           <entry name="$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" />
           <entry name="$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/guava/guava/21.0/guava-21.0.jar" />
           <entry name="$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.0/gson-2.8.0.jar" />
           <entry name="$MAVEN_REPOSITORY$/net/md-5/bungeecord-chat/1.12-SNAPSHOT/bungeecord-chat-1.12-20180712.114550-97.jar" />
         </processorPath>
         <module name="BuildConfigUpdater" />
       </profile>
+      <profile name="Annotation profile for ButtonProcessor" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="false">
+          <entry name="$PROJECT_DIR$/ButtonProcessor/target/classes" />
+          <entry name="$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.12.2-R0.1-SNAPSHOT/spigot-api-1.12.2-R0.1-20180712.012057-156.jar" />
+          <entry name="$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.0/gson-2.8.0.jar" />
+          <entry name="$MAVEN_REPOSITORY$/net/md-5/bungeecord-chat/1.12-SNAPSHOT/bungeecord-chat-1.12-20180712.114550-97.jar" />
+        </processorPath>
+        <module name="ButtonProcessor" />
+      </profile>
       <profile name="Annotation profile for ButtonCore Parent" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
@@ -32,11 +44,9 @@
           <entry name="$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.10.1/byte-buddy-agent-1.10.1.jar" />
           <entry name="$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.10/lombok-1.18.10.jar" />
           <entry name="$PROJECT_DIR$/ButtonProcessor/target/classes" />
-          <entry name="$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.21/snakeyaml-1.21.jar" />
           <entry name="$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.12.2-R0.1-SNAPSHOT/spigot-api-1.12.2-R0.1-20180712.012057-156.jar" />
           <entry name="$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" />
           <entry name="$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/guava/guava/21.0/guava-21.0.jar" />
           <entry name="$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.0/gson-2.8.0.jar" />
           <entry name="$MAVEN_REPOSITORY$/net/md-5/bungeecord-chat/1.12-SNAPSHOT/bungeecord-chat-1.12-20180712.114550-97.jar" />
         </processorPath>
@@ -44,12 +54,12 @@
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
-      <module name="BuildConfigUpdater" target="8" />
+      <module name="BuildConfigUpdater" target="1.5" />
       <module name="ButtonCore" target="1.5" />
-      <module name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" target="12" />
-      <module name="ButtonProcessor" target="8" />
+      <module name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" target="13" />
+      <module name="ButtonProcessor" target="1.5" />
       <module name="ChunkArchive" target="1.8" />
-      <module name="CorePOM" target="12" />
+      <module name="CorePOM" target="13" />
       <module name="RandomTeleport" target="1.8" />
     </bytecodeTargetLevel>
   </component>
diff --git a/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java b/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java
index d5b690b..0fbdca1 100755
--- a/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java
@@ -47,6 +47,7 @@ import java.util.logging.Logger;
 public class MainPlugin extends ButtonPlugin {
 	public static MainPlugin Instance;
 	public static Permission permission;
+	@Nullable
 	public static Essentials ess;
 
 	private Logger logger;
@@ -124,7 +125,8 @@ public class MainPlugin extends ButtonPlugin {
 				TBMCCoreAPI.SendException("Failed to write plugin list!", e);
 			}
 		}
-		ess = Essentials.getPlugin(Essentials.class);
+		if (getServer().getPluginManager().isPluginEnabled("Essentials"))
+			ess = Essentials.getPlugin(Essentials.class);
 		logger.info(pdf.getName() + " has been Enabled (V." + pdf.getVersion() + ") Test: " + test().get() + ".");
 	}
 
diff --git a/ButtonCore/src/main/java/buttondevteam/core/component/spawn/SpawnComponent.java b/ButtonCore/src/main/java/buttondevteam/core/component/spawn/SpawnComponent.java
index 7e0769b..2dab750 100644
--- a/ButtonCore/src/main/java/buttondevteam/core/component/spawn/SpawnComponent.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/component/spawn/SpawnComponent.java
@@ -89,11 +89,15 @@ public class SpawnComponent extends Component<MainPlugin> implements PluginMessa
 		@Command2.Subcommand
 		public void def(Player player) {
 			if (targetServer().get().length() == 0) {
-				player.sendMessage("§bTeleporting to spawn.");
+				player.sendMessage("§bTeleporting to spawn...");
 				try {
-					MainPlugin.ess.getUser(player).getTeleport().teleport(spawnloc, new Trade(BigDecimal.ZERO, MainPlugin.ess), PlayerTeleportEvent.TeleportCause.COMMAND);
+					if (MainPlugin.ess != null)
+						MainPlugin.ess.getUser(player).getTeleport()
+							.teleport(spawnloc, new Trade(BigDecimal.ZERO, MainPlugin.ess), PlayerTeleportEvent.TeleportCause.COMMAND);
+					else
+						player.teleport(spawnloc);
 				} catch (Exception e) {
-					e.printStackTrace();
+					player.sendMessage("§cFailed to teleport: " + e);
 				}
 				return;
 			}
diff --git a/ButtonCore/src/main/resources/plugin.yml b/ButtonCore/src/main/resources/plugin.yml
index 81c2ccf..c277429 100755
--- a/ButtonCore/src/main/resources/plugin.yml
+++ b/ButtonCore/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
 name: ChromaCore
 main: buttondevteam.core.MainPlugin
 version: 1.0
-author: TBMCPlugins
+author: NorbiPeti
 commands:
   updateplugin:
     description: Update a TBMC plugin
@@ -21,4 +21,5 @@ depend:
 softdepend:
   - Towny
   - Votifier
-  - Multiverse-Core
\ No newline at end of file
+  - Multiverse-Core
+  - Essentials
\ No newline at end of file
diff --git a/CorePOM/CorePOM.iml b/CorePOM/CorePOM.iml
index 0e07dc2..7d05a81 100644
--- a/CorePOM/CorePOM.iml
+++ b/CorePOM/CorePOM.iml
@@ -16,5 +16,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/CorePOM/pom.xml b/CorePOM/pom.xml
index 62bebbe..024d7eb 100755
--- a/CorePOM/pom.xml
+++ b/CorePOM/pom.xml
@@ -56,16 +56,6 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>12</source>
-                    <target>12</target>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 
     <repositories>