AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-27 01:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved all dependencies over to proper resoultion. Currently experiencing an issue with TF-WorldEdit not pulling custom additions

Browse Source
This commit is contained in:
Wild1145 2017-01-07 23:37:25 +00:00
parent 9fa4c0662c
commit 7b183612e4
2 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
pom.xml
View File

@ -43,8 +43,20 @@
<repositories> <repositories>
<repository> <repository>
<id>spigot</id> <id>ess-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url> <url>http://repo.ess3.net</url>
</repository>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>elmakers-repo</id>
<url>http://maven.elmakers.com/repository/</url>
</repository> </repository>
</repositories> </repositories>
@ -60,49 +72,47 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId> <artifactId>spigot</artifactId>
<version>1.10</version> <version>1.11.2-R0.1-SNAPSHOT</version>
<scope>system</scope> <scope>provided</scope>
<systemPath>${project.basedir}/lib/Spigot-1.10.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.pravian</groupId> <groupId>com.github.Pravian</groupId>
<artifactId>aero</artifactId> <artifactId>Aero</artifactId>
<version>2.0</version> <version>a0e1dc5</version>
<scope>system</scope> <scope>provided</scope>
<systemPath>${project.basedir}/lib/Aero-2.0.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.totalfreedom</groupId> <groupId>com.github.TotalFreedom</groupId>
<artifactId>bukkittelnet</artifactId> <artifactId>BukkitTelnet</artifactId>
<version>4.2</version> <version>v4.4</version>
<scope>system</scope> <scope>provided</scope>
<systemPath>${project.basedir}/lib/BukkitTelnet-4.3.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.totalfreedom</groupId> <groupId>com.github.TotalFreedom</groupId>
<artifactId>tf-worldedit</artifactId> <artifactId>TF-WorldEdit</artifactId>
<version>6.1.0-TF</version> <version>63626093f3</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/TF-WorldEdit-6.1.1.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.totalfreedom</groupId> <groupId>org.bukkit</groupId>
<artifactId>tf-essentials</artifactId> <artifactId>craftbukkit</artifactId>
<version>2.0-TF</version> <version>1.11.2-R0.1-SNAPSHOT</version>
<scope>system</scope> <scope>provided</scope>
<systemPath>${project.basedir}/lib/TF-Essentials-2.1.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>me.libaryaddict.disguise</groupId> <groupId>net.ess3</groupId>
<artifactId>LibsDisguises</artifactId> <artifactId>Essentials</artifactId>
<version>9.0.9</version> <version>2.13.1</version>
<scope>system</scope> </dependency>
<systemPath>${project.basedir}/lib/LibsDisguises-9.0.9.jar</systemPath>
<dependency>
<groupId>com.github.TotalFreedom</groupId>
<artifactId>TF-LibsDisguises</artifactId>
<version>913a577436</version>
</dependency> </dependency>
</dependencies> </dependencies>

8
src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java
View File

@ -4,11 +4,11 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FLog;
import me.totalfreedom.totalfreedommod.util.FUtil; import me.totalfreedom.totalfreedommod.util.FUtil;
import net.minecraft.server.v1_10_R1.EntityPlayer; import net.minecraft.server.v1_11_R1.EntityPlayer;
import net.minecraft.server.v1_10_R1.MinecraftServer; import net.minecraft.server.v1_11_R1.MinecraftServer;
import net.minecraft.server.v1_10_R1.PropertyManager; import net.minecraft.server.v1_11_R1.PropertyManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_10_R1.CraftServer; import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
public class ServerInterface extends FreedomService public class ServerInterface extends FreedomService
{ {