Fix for working build

BentoBoxWorld · May 17, 2019 · 54244cd · 54244cd
1 parent 0dca7f9
commit 54244cd
Show file tree

Hide file tree

Showing 6 changed files with 149 additions and 106 deletions.
diff --git a/.classpath b/.classpath
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/.project b/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>MVdWPlaceholderAPI</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -0,0 +1,98 @@
+<?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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>x2.forks-be.maximvdw</groupId>
+  <artifactId>MVdWPlaceholderAPI</artifactId>
+  <name>MVdWPlaceholderAPI</name>
+  <version>2.5.1-FIXED-SNAPSHOT</version>
+  <description>Placeholder API for MVdW Software plugins</description>
+  <build>
+    <resources>
+      <resource>
+        <filtering>true</filtering>
+        <directory>${basedir}</directory>
+        <includes>
+          <include>*.yml</include>
+        </includes>
+      </resource>
+    </resources>
+    <finalName>MVdWPlaceholderAPI</finalName>
+    <plugins>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+          <finalName>MVdWPlaceholderAPI</finalName>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.2</version>
+        <configuration>
+          <target>1.7</target>
+          <source>1.7</source>
+          <encoding>UTF-8</encoding>
+          <useIncrementalCompilation>false</useIncrementalCompilation>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <artifactSet>
+            <includes>
+              <include>org.bstats:*</include>
+            </includes>
+          </artifactSet>
+          <relocations>
+            <relocation>
+              <pattern>org.bstats</pattern>
+              <shadedPattern>be.maximvdw.placeholderapi.internal.bstats</shadedPattern>
+            </relocation>
+          </relocations>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.12</version>
+        <configuration>
+          <junitArtifactName>junit:junit</junitArtifactName>
+          <argLine>-Xms256m -Xmx512m -XX:MaxPermSize=128m -ea
+						-Dfile.encoding=UTF-8</argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <repositories>
+    <repository>
+      <id>public</id>
+      <name>Public Repositories</name>
+      <url>http://repo.mvdw-software.be/content/groups/public/</url>
+    </repository>
+    <repository>
+      <id>bstats-repo</id>
+      <url>http://repo.bstats.org/content/repositories/releases/</url>
+    </repository>
+    <repository>
+      <id>prouser123-public</id>
+      <url>https://repo.prouser123.me/repository/maven-public/</url>
+    </repository>
+  </repositories>
+  <dependencies>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot-api</artifactId>
+      <version>1.10-R0.1-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
+
diff --git a/pom.xml b/pom.xml
@@ -1,9 +1,9 @@
 <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>be.maximvdw</groupId>
+	<groupId>x2.forks-be.maximvdw</groupId>
 	<artifactId>MVdWPlaceholderAPI</artifactId>
-	<version>2.5.1-SNAPSHOT</version>
+	<version>2.5.1-FIXED-SNAPSHOT</version>
 	<name>MVdWPlaceholderAPI</name>
 	<description>Placeholder API for MVdW Software plugins</description>
 	<repositories>
@@ -12,26 +12,20 @@
 			<name>Public Repositories</name>
 			<url>http://repo.mvdw-software.be/content/groups/public/</url>
 		</repository>
-		<repository>
-			<id>mvdw-software</id>
-			<name>Private Projects</name>
-			<url>http://repo.mvdw-software.be/content/groups/private-group/</url>
-		</repository>
 		<repository>
 			<id>bstats-repo</id>
 			<url>http://repo.bstats.org/content/repositories/releases/</url>
 		</repository>
+        <repository>
+            <id>prouser123-public</id>
+            <url>https://repo.prouser123.me/repository/maven-public/</url>
+        </repository>
 	</repositories>
 	<dependencies>
-		<dependency>
-			<groupId>be.maximvdw</groupId>
-			<artifactId>MVdWUpdater</artifactId>
-			<version>1.6.0-SNAPSHOT</version>
-		</dependency>
 		<dependency>
 			<groupId>org.spigotmc</groupId>
-			<artifactId>spigot</artifactId>
-			<version>1.9</version>
+			<artifactId>spigot-api</artifactId>
+			<version>1.10-R0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.bstats</groupId>

diff --git a/src/main/java/be/maximvdw/placeholderapi/PlaceholderAPI.java b/src/main/java/be/maximvdw/placeholderapi/PlaceholderAPI.java
@@ -5,7 +5,6 @@
 import be.maximvdw.placeholderapi.internal.PlaceholderPack;
 import be.maximvdw.placeholderapi.internal.PlaceholderPlugin;
 import be.maximvdw.placeholderapi.internal.ui.SendConsole;
-import be.maximvdw.placeholderapi.internal.updater.MVdWUpdaterHook;
 import be.maximvdw.placeholderapi.internal.utils.DateUtils;
 import be.maximvdw.placeholderapi.internal.utils.NumberUtils;
 import be.maximvdw.placeholderapi.internal.utils.bukkit.BukkitUtils;
@@ -48,12 +47,6 @@ public void onEnable() {
         new NumberUtils();
 
         int resource = 11182;
-        try {
-            if (Bukkit.getPluginManager().isPluginEnabled("MVdWUpdater"))
-                new MVdWUpdaterHook(this, resource);
-        } catch (Throwable ex) {
-            // No updater
-        }
 
         SendConsole.info("Sending metrics ...");
         try {

diff --git a/src/main/java/be/maximvdw/placeholderapi/internal/updater/MVdWUpdaterHook.java b/src/main/java/be/maximvdw/placeholderapi/internal/updater/MVdWUpdaterHook.java