From 7b183612e48e40fba63858d6f7643582830b8fd8 Mon Sep 17 00:00:00 2001 From: Wild1145 Date: Sat, 7 Jan 2017 23:37:25 +0000 Subject: [PATCH] Moved all dependencies over to proper resoultion. Currently experiencing an issue with TF-WorldEdit not pulling custom additions --- pom.xml | 70 +++++++++++-------- .../totalfreedommod/ServerInterface.java | 8 +-- 2 files changed, 44 insertions(+), 34 deletions(-) diff --git a/pom.xml b/pom.xml index b35d71b5..a04f5692 100644 --- a/pom.xml +++ b/pom.xml @@ -43,8 +43,20 @@ - spigot - https://hub.spigotmc.org/nexus/content/groups/public/ + ess-repo + http://repo.ess3.net + + + jitpack.io + https://jitpack.io + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + elmakers-repo + http://maven.elmakers.com/repository/ @@ -60,49 +72,47 @@ org.spigotmc spigot - 1.10 - system - ${project.basedir}/lib/Spigot-1.10.jar + 1.11.2-R0.1-SNAPSHOT + provided - net.pravian - aero - 2.0 - system - ${project.basedir}/lib/Aero-2.0.jar + com.github.Pravian + Aero + a0e1dc5 + provided - net.totalfreedom - bukkittelnet - 4.2 - system - ${project.basedir}/lib/BukkitTelnet-4.3.jar + com.github.TotalFreedom + BukkitTelnet + v4.4 + provided - net.totalfreedom - tf-worldedit - 6.1.0-TF - system - ${project.basedir}/lib/TF-WorldEdit-6.1.1.jar + com.github.TotalFreedom + TF-WorldEdit + 63626093f3 - net.totalfreedom - tf-essentials - 2.0-TF - system - ${project.basedir}/lib/TF-Essentials-2.1.jar + org.bukkit + craftbukkit + 1.11.2-R0.1-SNAPSHOT + provided - me.libaryaddict.disguise - LibsDisguises - 9.0.9 - system - ${project.basedir}/lib/LibsDisguises-9.0.9.jar + net.ess3 + Essentials + 2.13.1 + + + + com.github.TotalFreedom + TF-LibsDisguises + 913a577436 diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java b/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java index 9979d2a9..e0e964cd 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java @@ -4,11 +4,11 @@ import java.util.Arrays; import java.util.List; import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FUtil; -import net.minecraft.server.v1_10_R1.EntityPlayer; -import net.minecraft.server.v1_10_R1.MinecraftServer; -import net.minecraft.server.v1_10_R1.PropertyManager; +import net.minecraft.server.v1_11_R1.EntityPlayer; +import net.minecraft.server.v1_11_R1.MinecraftServer; +import net.minecraft.server.v1_11_R1.PropertyManager; 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 {