From f4753d001bf533c3ec6fe97c0841e11bc9a68e24 Mon Sep 17 00:00:00 2001 From: Ashijin Date: Tue, 17 Aug 2021 19:53:21 -0600 Subject: [PATCH 01/11] ! brrrrrr --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 082f826d..c991be5c 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ net.Indyuce MMOCore - 1.7.1 + 1.8.0 provided From ea5d9c69af072a053ca95b8b94ece965c9d4c350 Mon Sep 17 00:00:00 2001 From: Ashijin Date: Tue, 17 Aug 2021 20:12:14 -0600 Subject: [PATCH 02/11] ! brrrrrr --- pom.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index c991be5c..27a15e21 100644 --- a/pom.xml +++ b/pom.xml @@ -88,6 +88,12 @@ spigot-repo https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + egg82-ninja + https://www.myget.org/F/egg82-java/maven/ + @@ -193,16 +199,14 @@ com.github.Eniripsa96 SkillAPI master-SNAPSHOT - system - ${basedir}/lib/SkillAPI.jar + provided n3kas ae.api 5.7.6 - system - ${basedir}/lib/AE-API.jar + provided From 06b3878b4c9da86ea5292f0148cab6f9bb0077ed Mon Sep 17 00:00:00 2001 From: Ashijin Date: Tue, 17 Aug 2021 20:48:30 -0600 Subject: [PATCH 03/11] ! aaaaa --- pom.xml | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 27a15e21..9318289e 100644 --- a/pom.xml +++ b/pom.xml @@ -94,6 +94,18 @@ egg82-ninja https://www.myget.org/F/egg82-java/maven/ + + + + codemc-repo + https://repo.codemc.io/repository/maven-public/ + + + + + citizens-repo + http://repo.citizensnpcs.co/ + @@ -155,7 +167,7 @@ com.github.RednedEpic PhatLoots - master-dev-build-79-g4ab7dd1-97 + 4.2.3 provided @@ -167,9 +179,9 @@ - io.lumine.xikage - MythicMobs - 4.11.0-SNAPSHOT + io.lumine + MythicMobs-Dist + 5.0.0-SNAPSHOT provided @@ -218,19 +230,17 @@ - com.bekvon.bukkit + com.bekvon.bukkit.residence Residence 4.8.7.2 - system - ${basedir}/lib/Residence.jar + provided - com.Zrips + com.Zrips.CMI CMI 8.6.5.0 - system - ${basedir}/lib/CMI.jar + provided @@ -314,11 +324,10 @@ - com.gmail.filoghost - HolographicDisplays - 2.4.8 - system - ${basedir}/lib/HolographicDisplays.jar + com.gmail.filoghost.holographicdisplays + holographicdisplays-api + 2.4.0 + provided @@ -339,10 +348,9 @@ com.sainttx.holograms - holograms + Holograms 2.9.1 - system - ${basedir}/lib/Holograms.jar + provided From 19308943800bd53eb2d3a838dd8a31b27554968d Mon Sep 17 00:00:00 2001 From: Ashijin Date: Tue, 17 Aug 2021 20:56:46 -0600 Subject: [PATCH 04/11] ! ffffffff --- pom.xml | 43 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index 9318289e..9a2c7585 100644 --- a/pom.xml +++ b/pom.xml @@ -210,7 +210,7 @@ com.github.Eniripsa96 SkillAPI - master-SNAPSHOT + master provided @@ -225,8 +225,7 @@ org.black_ixx BossShop 2.0.9 - system - ${basedir}/lib/BossShopPro.jar + provided @@ -247,80 +246,63 @@ com.herocraftonline heroes 1.9.3 - system - ${basedir}/lib/Heroes.jar - - - - com.github.klyser8 - Iridescent - 1.2.2 - system - ${basedir}/lib/Iridescent.jar + provided com.gmail.nossr50 mcMMO 2.1.104 - system - ${basedir}/lib/mcMMO.jar + provided us.eunoians McRPG 1.1.2 - system - ${basedir}/lib/McRPG.jar + provided me.baks rpl 3.9.30 - system - ${basedir}/lib/RPGPlayerLeveling.jar + provided me.leothepro555 skills 12.3.5 - system - ${basedir}/lib/Skills.jar + provided org.skills.main SkillsPro 18.9.0.1 - system - ${basedir}/lib/SkillsPro.jar + provided me.robin BattleLevels 6.9.1 - system - ${basedir}/lib/BattleLevels.jar + provided com.evill4mer RealDualWield 1.1.12 - system - ${basedir}/lib/RealDualWield.jar + provided me.arasple.mc TrHologram 1.11 - system - ${basedir}/lib/TrHologram.jar + provided @@ -334,8 +316,7 @@ de.tobiyas RacesAndClasses 1.2.6 - system - ${basedir}/lib/RacesAndClasses.jar + provided From dce13e3293276bdc105e0e9c0499341400349097 Mon Sep 17 00:00:00 2001 From: Ashijin Date: Tue, 17 Aug 2021 21:02:37 -0600 Subject: [PATCH 05/11] ! ffffff --- pom.xml | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 9a2c7585..cdcd858d 100644 --- a/pom.xml +++ b/pom.xml @@ -323,8 +323,7 @@ ru.endlesscode rpginventory 2.3.0 - system - ${basedir}/lib/RPGInventory.jar + provided @@ -338,48 +337,42 @@ com.archyx AureliumSkills 1.0.6 - system - ${basedir}/lib/AureliumSkills.jar + provided me.badbones69 crazyenchantments 1.8-db9 - system - ${basedir}/lib/CrazyEnchantments.jar + provided net.citizensnpcs citizens - 2.0.25-SNAPSHOT - system - ${basedir}/lib/Citizens.jar + 2.0.25 + provided org.inventivetalent glowapi - 1.4.8-SNAPSHOT - system - ${basedir}/lib/GlowAPI.jar + 1.4.8 + provided com.denizenscript denizen 1.2.1-b1744-REL - system - ${basedir}/lib/Denizen-1.2.1-b1744-REL.jar + provided com.denizenscript depenizen 2.0.0-b709 - system - ${basedir}/lib/Depenizen-2.0.0-b709.jar + provided From aaa85df3fa13f679a0dc8e4bbec2acfd8289f3a2 Mon Sep 17 00:00:00 2001 From: Ashijin Date: Tue, 17 Aug 2021 21:04:16 -0600 Subject: [PATCH 06/11] ! brrrrr --- pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pom.xml b/pom.xml index cdcd858d..0b136ca8 100644 --- a/pom.xml +++ b/pom.xml @@ -100,12 +100,6 @@ codemc-repo https://repo.codemc.io/repository/maven-public/ - - - - citizens-repo - http://repo.citizensnpcs.co/ - From 1c0626db93293b6eb842f95722b0c7c19ad3f503 Mon Sep 17 00:00:00 2001 From: Ashijin Date: Tue, 17 Aug 2021 21:06:51 -0600 Subject: [PATCH 07/11] ! brrrr --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0b136ca8..d131d628 100644 --- a/pom.xml +++ b/pom.xml @@ -343,7 +343,7 @@ net.citizensnpcs - citizens + Citizens 2.0.25 provided From 4a343c8eb431c2547cfd87447243ef8b8dbb129e Mon Sep 17 00:00:00 2001 From: Ashijin Date: Tue, 17 Aug 2021 21:09:30 -0600 Subject: [PATCH 08/11] ! brrrrr --- .../mmoitems/comp/parse/IridescentParser.java | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 src/main/java/net/Indyuce/mmoitems/comp/parse/IridescentParser.java diff --git a/src/main/java/net/Indyuce/mmoitems/comp/parse/IridescentParser.java b/src/main/java/net/Indyuce/mmoitems/comp/parse/IridescentParser.java deleted file mode 100644 index b94c7635..00000000 --- a/src/main/java/net/Indyuce/mmoitems/comp/parse/IridescentParser.java +++ /dev/null @@ -1,13 +0,0 @@ -package net.Indyuce.mmoitems.comp.parse; - -import org.bukkit.entity.Player; - -import com.github.klyser8.iridescent.util.ColorUtil; - -public class IridescentParser implements StringInputParser { - - @Override - public String parseInput(Player player, String input) { - return ColorUtil.colorMessage(player, input, false); - } -} From 93eddaf4118a4d1cb264bf9abe21d0774649e69d Mon Sep 17 00:00:00 2001 From: Ashijin Date: Tue, 17 Aug 2021 21:10:55 -0600 Subject: [PATCH 09/11] ! brrrrr --- src/main/java/net/Indyuce/mmoitems/MMOItems.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/net/Indyuce/mmoitems/MMOItems.java b/src/main/java/net/Indyuce/mmoitems/MMOItems.java index ef34e8f5..b5785b2a 100644 --- a/src/main/java/net/Indyuce/mmoitems/MMOItems.java +++ b/src/main/java/net/Indyuce/mmoitems/MMOItems.java @@ -33,7 +33,6 @@ import net.Indyuce.mmoitems.comp.mmocore.MMOCoreMMOLoader; import net.Indyuce.mmoitems.comp.mmoinventory.MMOInventorySupport; import net.Indyuce.mmoitems.comp.mythicmobs.LootsplosionListener; import net.Indyuce.mmoitems.comp.mythicmobs.MythicMobsLoader; -import net.Indyuce.mmoitems.comp.parse.IridescentParser; import net.Indyuce.mmoitems.comp.parse.StringInputParser; import net.Indyuce.mmoitems.comp.parse.placeholders.DefaultPlaceholderParser; import net.Indyuce.mmoitems.comp.parse.placeholders.PlaceholderAPIParser; @@ -267,11 +266,6 @@ public class MMOItems extends LuminePlugin { getLogger().log(Level.INFO, "Hooked onto AdvancedEnchantments"); } - if (Bukkit.getPluginManager().getPlugin("Iridescent") != null) { - stringInputParsers.add(new IridescentParser()); - getLogger().log(Level.INFO, "Hooked onto Iridescent"); - } - if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) { getLogger().log(Level.INFO, "Hooked onto PlaceholderAPI"); placeholderParser = new PlaceholderAPIParser(); From 21ced13319c869a897f7c2ce963725e823731a4d Mon Sep 17 00:00:00 2001 From: Ashijin Date: Tue, 17 Aug 2021 21:12:09 -0600 Subject: [PATCH 10/11] Moved dependencies to nexus --- src/main/java/net/Indyuce/mmoitems/MMOItems.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/Indyuce/mmoitems/MMOItems.java b/src/main/java/net/Indyuce/mmoitems/MMOItems.java index b5785b2a..d2acf252 100644 --- a/src/main/java/net/Indyuce/mmoitems/MMOItems.java +++ b/src/main/java/net/Indyuce/mmoitems/MMOItems.java @@ -277,7 +277,7 @@ public class MMOItems extends LuminePlugin { getLogger().log(Level.INFO, "Hooked onto GlowAPI (Item Glow)"); } else Bukkit.getPluginManager().registerEvents(new NoGlowListener(), this); - } + } if (Bukkit.getPluginManager().getPlugin("RealDualWield") != null) { Bukkit.getPluginManager().registerEvents(new RealDualWieldHook(), this); From 7672603967739338610680b1cd359b52b3662d8c Mon Sep 17 00:00:00 2001 From: Ashijin Date: Tue, 17 Aug 2021 21:15:04 -0600 Subject: [PATCH 11/11] ! missing gson --- pom.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index d131d628..8c17085f 100644 --- a/pom.xml +++ b/pom.xml @@ -117,11 +117,9 @@ - net.Indyuce.mmoitems.lib - GoogleGSON + com.google.code.gson + gson 2.8.5 - system - ${basedir}/lib/GoogleGSON.jar