From 1b9f38bbba6d5f2f1749cd0ed0086ee79abcba1c Mon Sep 17 00:00:00 2001 From: Yannic Hock Date: Sat, 30 Nov 2024 11:02:32 +0100 Subject: [PATCH] Added CMI-Extension by YannicHock (#3815) * Added CMI as an softdependency and in the ExtensionRegister as well as into the shadowjar * Added myself to Contributors * Removed seconds Extension for CMI as it now uses Tabs * Remove temporary maven repository Affects issues: - Close #3735 - #3292 --------- Co-authored-by: Yannic Hock Co-authored-by: Aurora Lahtela <24460436+AuroraLS3@users.noreply.github.com> --- .../djrapitops/plan/delivery/rendering/html/Contributors.java | 3 ++- Plan/common/src/main/resources/plugin.yml | 1 + Plan/extensions/build.gradle | 1 + .../plan/extension/implementation/ExtensionRegister.java | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/Contributors.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/Contributors.java index 0868a08996..bc721bbd88 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/Contributors.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/Contributors.java @@ -114,7 +114,8 @@ public class Contributors { new Contributor("liuzhen932", LANG), new Contributor("Sniper_TVmc", LANG), new Contributor("mcmdev", CODE), - new Contributor("ZhangYuheng", CODE) + new Contributor("ZhangYuheng", CODE), + new Contributor("YannicHock", CODE) }; private Contributors() { diff --git a/Plan/common/src/main/resources/plugin.yml b/Plan/common/src/main/resources/plugin.yml index a41bd8996f..e44c63d9f8 100644 --- a/Plan/common/src/main/resources/plugin.yml +++ b/Plan/common/src/main/resources/plugin.yml @@ -17,6 +17,7 @@ softdepend: - DKCoins - DKBans - Essentials + - CMI - Factions - FastLogin - GriefPrevention diff --git a/Plan/extensions/build.gradle b/Plan/extensions/build.gradle index e4009164e6..4d29c3ad29 100644 --- a/Plan/extensions/build.gradle +++ b/Plan/extensions/build.gradle @@ -11,6 +11,7 @@ dependencies { shadow 'net.playeranalytics:Extension-DKBans:2.1.2-R1.3' shadow 'net.playeranalytics:Extension-DKCoins:3.0.5-R1.1' shadow 'net.playeranalytics:Extension-EssentialsX:2.15.0-R2.0' + shadow 'net.playeranalytics:Extension-CMI:9.7.4.1' shadow 'net.playeranalytics:Extension-Factions:2.14.0-R1.1' shadow 'net.playeranalytics:Extension-FactionsUUID:1.6.9.5-U0.5.25-R1.1' shadow 'net.playeranalytics:Extension-FastLogin:R1.3' diff --git a/Plan/extensions/src/main/java/com/djrapitops/plan/extension/implementation/ExtensionRegister.java b/Plan/extensions/src/main/java/com/djrapitops/plan/extension/implementation/ExtensionRegister.java index 06fa3927ff..a2bb7914c4 100644 --- a/Plan/extensions/src/main/java/com/djrapitops/plan/extension/implementation/ExtensionRegister.java +++ b/Plan/extensions/src/main/java/com/djrapitops/plan/extension/implementation/ExtensionRegister.java @@ -31,6 +31,7 @@ import net.playeranalytics.extension.dkbans.DKBansExtensionFactory; import net.playeranalytics.extension.dkcoins.DKCoinsExtensionFactory; import net.playeranalytics.extension.essentials.EssentialsExtensionFactory; +import net.playeranalytics.extension.cmi.CMIExtensionFactory; import net.playeranalytics.extension.factions.FactionsExtensionFactory; import net.playeranalytics.extension.factionsuuid.FactionsUUIDExtensionFactory; import net.playeranalytics.extension.fastlogin.FastLoginExtensionFactory; @@ -112,6 +113,7 @@ public void registerBuiltInExtensions(Set disabledExtensions) { register(new DKCoinsExtensionFactory(), DKCoinsExtensionFactory::createExtension, DKCoinsExtensionFactory::registerListener); register(new EssentialsExtensionFactory(), EssentialsExtensionFactory::createExtension, EssentialsExtensionFactory::registerUpdateListeners); register(new EssentialsExtensionFactory(), EssentialsExtensionFactory::createEcoExtension, EssentialsExtensionFactory::registerEconomyUpdateListeners); + register(new CMIExtensionFactory(), CMIExtensionFactory::createCMIExtension, CMIExtensionFactory::registerCMIUpdateListeners); register(new FactionsExtensionFactory(), FactionsExtensionFactory::createExtension); register(new FactionsUUIDExtensionFactory(), FactionsUUIDExtensionFactory::createExtension, FactionsUUIDExtensionFactory::registerExpansion); register(new FastLoginExtensionFactory(), FastLoginExtensionFactory::createExtension);