Use Maven for the massive artifacts

games647 · Sep 29, 2016 · 8eeb9a2 · 8eeb9a2
1 parent 980409c
commit 8eeb9a2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/lib/Factions-1.6.9.5-U0.1.15.jar b/lib/Factions-1.6.9.5-U0.1.15.jar
diff --git a/lib/Factions.jar b/lib/Factions.jar
diff --git a/lib/MassiveCore.jar b/lib/MassiveCore.jar
diff --git a/pom.xml b/pom.xml
@@ -160,6 +160,16 @@
             <id>placeholderapi</id>
             <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
         </repository>
+
+        <repository>
+            <id>massive-repo</id>
+            <url>https://repo.dustplanet.de/artifactory/ext-release-local</url>
+        </repository>
+
+        <repository>
+            <id>turt2live-repo</id>
+            <url>http://repo.turt2live.com/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -359,32 +369,23 @@
         <dependency>
             <groupId>com.massivecraft</groupId>
             <artifactId>FactionsUUID</artifactId>
+            <!--the name can't be the same because maven would automatically use the newer version-->
             <!--Factions-UUID fork of 1.6/1.8-->
             <version>1.6.9.5-U0.1.6</version>
-            <!--Make it possible to build automatically like https://github.com/drtshock/ObsidianDestroyer-->
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/Factions-1.6.9.5-U0.1.15.jar</systemPath>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>com.massivecraft</groupId>
-            <!--the name can't be the same because maven would automatically use the newer version-->
-            <artifactId>factions-2.7</artifactId>
-            <!--2.7+-->
-            <version>2.7.1</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/Factions.jar</systemPath>
-            <optional>true</optional>
+            <artifactId>factions</artifactId>
+            <version>2.8.16</version>
         </dependency>
+
         <!--MCore must be available for factions-->
         <dependency>
             <groupId>com.massivecraft</groupId>
-            <artifactId>mcore</artifactId>
-            <version>2.7.1</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/MassiveCore.jar</systemPath>
-            <optional>true</optional>
+            <artifactId>massivecore</artifactId>
+            <version>2.8.6</version>
         </dependency>
 
         <!--Testing environment-->

diff --git a/src/main/java/com/github/games647/scoreboardstats/variables/defaults/FactionsVariables.java b/src/main/java/com/github/games647/scoreboardstats/variables/defaults/FactionsVariables.java
@@ -77,7 +77,7 @@ private void getNewFactionScore(Player player, String variable, ReplaceEvent rep
     //factions 1.6.9 and 1.8.2
     private void getOldFactionScore(Player player, String variable, ReplaceEvent replaceEvent) {
         //If factions doesn't track the player yet return -1
-        FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
+        FPlayer fPlayer = FPlayers.i.get(player);
         if (fPlayer == null) {
             return;
         }