Ajout des Shops Joueur

build.gradle

@@ -88,7 +88,7 @@ java {
 }
 
 paperweight {
-  addServerDependencyTo = configurations.named(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME).map { [it] as Set }
+    addServerDependencyTo = configurations.named(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME).map { [it] as Set }
 }
 
 tasks.withType(JavaCompile).configureEach {
@@ -134,4 +134,4 @@ tasks.shadowJar {
 
 tasks.test {
     useJUnitPlatform()
-}
+}

src/main/java/fr/openmc/api/input/location/ItemInteraction.java

@@ -168,12 +168,10 @@ void onPlayerDeath(PlayerDeathEvent event) {
      * Méthode qui permet de verifier si l'item est celui avec qui on interagit
      */
     private static boolean isItemInteraction(ItemStack item) {
-        if (item == null || item.getType() == Material.AIR)
-            return false;
+        if (item == null || item.getType() == Material.AIR) return false;
 
         ItemMeta meta = item.getItemMeta();
-        if (meta == null)
-            return false;
+        if (meta == null) return false;
 
         if (item.hasItemMeta()) {
             PersistentDataContainer data = item.getItemMeta().getPersistentDataContainer();

src/main/java/fr/openmc/core/CommandsManager.java

@@ -8,6 +8,8 @@
 import fr.openmc.core.commands.fun.Playtime;
 import fr.openmc.core.commands.utils.*;
 import fr.openmc.core.features.adminshop.AdminShopCommand;
+import fr.openmc.core.features.corporation.commands.ShopAdminCommand;
+import fr.openmc.core.features.corporation.commands.ShopCommand;
 import fr.openmc.core.features.credits.CreditsCommand;
 import fr.openmc.core.features.cube.CubeCommands;
 import fr.openmc.core.features.events.halloween.commands.HalloweenCommands;
@@ -59,6 +61,8 @@ private static void registerCommands() {
                 new Cooldowns(),
                 new CreditsCommand(),
                 new CubeCommands(),
+                new ShopCommand(),
+                new ShopAdminCommand(),
                 new HalloweenCommands()
         );
     }

src/main/java/fr/openmc/core/ListenersManager.java

@@ -2,6 +2,7 @@
 
 import fr.openmc.api.input.ChatInput;
 import fr.openmc.api.input.location.ItemInteraction;
+import fr.openmc.core.features.corporation.listener.ShopListener;
 import fr.openmc.core.features.cube.listeners.CubeListener;
 import fr.openmc.core.features.cube.listeners.RepulseEffectListener;
 import fr.openmc.core.features.cube.multiblocks.MultiBlocksListeners;
@@ -38,6 +39,7 @@ public static void init() {
                 new PlayerSettingsManager(),
                 new InteractListener(),
                 new AywenCapListener(),
+		            new ShopListener(),
                 new NoMoreRabbit(),
                 new ArmorListener(),
                 new SpawnerExtractorListener()

src/main/java/fr/openmc/core/OMCPlugin.java

@@ -16,6 +16,7 @@
 import fr.openmc.core.features.city.sub.statistics.CityStatisticsManager;
 import fr.openmc.core.features.city.sub.war.WarManager;
 import fr.openmc.core.features.contest.managers.ContestManager;
+import fr.openmc.core.features.corporation.manager.ShopManager;
 import fr.openmc.core.features.cube.multiblocks.MultiBlockManager;
 import fr.openmc.core.features.displays.TabList;
 import fr.openmc.core.features.displays.bossbar.BossbarManager;
@@ -153,6 +154,7 @@ public void loadWithItemsAdder() {
         QuestsManager.init();
         CityManager.init();
         ContestManager.init();
+        ShopManager.init();
         DreamManager.init();
         MultiBlockManager.init();
         if (WorldGuardHook.isHasWorldGuard()) {
@@ -216,6 +218,9 @@ public void onDisable() {
 
         // - Cooldowns
         DynamicCooldownManager.saveCooldowns();
+
+        // - Shops
+        ShopManager.shutdown();
 
 
         if (!OMCPlugin.isUnitTestVersion()) {

src/main/java/fr/openmc/core/disabled/corporation/manager/CompanyManager.java.bak → src/main/java/fr/openmc/core/disabled/corporation/CompanyManager.java.bak

@@ -1,4 +1,4 @@
-package fr.openmc.core.disabled.corporation.manager;
+package fr.openmc.core.disabled.corporation;
 
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
@@ -10,14 +10,18 @@ import fr.openmc.core.CommandsManager;
 import fr.openmc.core.OMCPlugin;
 import fr.openmc.core.disabled.corporation.CorpPermission;
 import fr.openmc.core.disabled.corporation.MethodState;
+import fr.openmc.core.features.city.City;
+import fr.openmc.core.features.city.CityManager;
+import fr.openmc.core.features.corporation.MethodState;
 import fr.openmc.core.disabled.corporation.commands.CompanyCommand;
-import fr.openmc.core.disabled.corporation.commands.ShopCommand;
+import fr.openmc.core.features.corporation.commands.ShopCommand;
 import fr.openmc.core.disabled.corporation.company.Company;
 import fr.openmc.core.disabled.corporation.company.CompanyOwner;
-import fr.openmc.core.disabled.corporation.data.MerchantData;
-import fr.openmc.core.disabled.corporation.listener.CustomItemsCompanyListener;
-import fr.openmc.core.disabled.corporation.listener.ShopListener;
+import fr.openmc.core.features.corporation.data.MerchantData;
+import fr.openmc.core.features.corporation.listener.ShopListener;
 import fr.openmc.core.disabled.corporation.models.*;
+import fr.openmc.core.features.corporation.manager.PlayerShopManager;
+import fr.openmc.core.features.corporation.manager.ShopManager;
 import fr.openmc.core.disabled.corporation.shops.Shop;
 import fr.openmc.core.disabled.corporation.shops.ShopItem;
 import fr.openmc.core.disabled.corporation.shops.Supply;

src/main/java/fr/openmc/core/disabled/corporation/commands/CompanyCommand.java.bak

@@ -3,11 +3,11 @@ package fr.openmc.core.disabled.corporation.commands;
 import fr.openmc.core.features.city.City;
 import fr.openmc.core.features.city.CityManager;
 import fr.openmc.core.disabled.corporation.CorpPermission;
-import fr.openmc.core.disabled.corporation.MethodState;
+import fr.openmc.core.features.corporation.MethodState;
 import fr.openmc.core.disabled.corporation.company.Company;
 import fr.openmc.core.disabled.corporation.company.CompanyOwner;
-import fr.openmc.core.disabled.corporation.manager.CompanyManager;
-import fr.openmc.core.disabled.corporation.manager.PlayerShopManager;
+import fr.openmc.core.disabled.corporation.CompanyManager;
+import fr.openmc.core.features.corporation.manager.PlayerShopManager;
 import fr.openmc.core.disabled.corporation.menu.company.CompanyBaltopMenu;
 import fr.openmc.core.disabled.corporation.menu.company.CompanyMenu;
 import fr.openmc.core.disabled.corporation.menu.company.CompanySearchMenu;