Evènement d'Halloween

src/main/java/fr/openmc/api/cooldown/DynamicCooldownManager.java

@@ -270,9 +270,9 @@ public static void cleanup() {
     public static void clear(String group) {
         cooldowns.forEach((uuid, userCooldowns) -> {
             Cooldown removed = userCooldowns.remove(group);
-            if (removed != null) removed.cancelTask();
+            clear(removed);
         });
-        cooldowns.entrySet().removeIf(entry -> entry.getValue().isEmpty()); // A test
+        cooldowns.entrySet().removeIf(entry -> entry.getValue().isEmpty());
     }
 
     /**
@@ -288,8 +288,19 @@ public static void clear(UUID uuid, String group, boolean callEvent) {
             if (callEvent) Bukkit.getPluginManager().callEvent(new CooldownEndEvent(uuid, group));
 
             Cooldown removed = userCooldowns.remove(group);
-            if (removed != null) removed.cancelTask();
+            clear(removed);
             if (userCooldowns.isEmpty()) cooldowns.remove(uuid);
         }
     }
+
+    private static void clear(Cooldown cooldown) {
+        if (cooldown == null) return;
+
+        cooldown.cancelTask();
+        try {
+            cooldownDao.delete(cooldown);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

src/main/java/fr/openmc/api/datapacks/OMCDatapack.java

@@ -2,7 +2,7 @@
 
 import fr.openmc.api.datapacks.injectors.PackMetadataInjector;
 import fr.openmc.core.OMCPlugin;
-import fr.openmc.core.utils.FilesUtils;
+import fr.openmc.core.utils.file.FilesUtils;
 import io.papermc.paper.plugin.bootstrap.BootstrapContext;
 import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
 import lombok.Getter;

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

@@ -35,7 +35,8 @@
 import fr.openmc.core.features.economy.TransactionsManager;
 import fr.openmc.core.features.events.EventsManager;
 import fr.openmc.core.features.events.contents.dailyevents.DailyEventsManager;
-import fr.openmc.core.features.events.contents.halloween.managers.HalloweenManager;
+import fr.openmc.core.features.events.contents.halloween.festival.HalloweenFestivalManager;
+//import fr.openmc.core.features.events.contents.halloween.pumpkin.managers.HalloweenManager;
 import fr.openmc.core.features.events.contents.open.OpenManager;
 import fr.openmc.core.features.events.contents.weeklyevents.WeeklyEventsManager;
 import fr.openmc.core.features.events.contents.weeklyevents.contents.contest.ContestParticlesUtils;
@@ -63,6 +64,7 @@
 import fr.openmc.core.hooks.github.GitHubHook;
 import fr.openmc.core.hooks.itemsadder.ItemsAdderHook;
 import fr.openmc.core.listeners.ItemsAddersListener;
+import fr.openmc.core.registry.structures.model.CustomStructureManager;
 import fr.openmc.core.utils.text.MotdUtils;
 import io.papermc.paper.datapack.Datapack;
 import lombok.Getter;
@@ -112,14 +114,16 @@ public class OMCPlugin extends JavaPlugin {
             AdminShopManager::new,
             HelpConfigManager::new,
             () -> new AnimationsManager(),
-            () -> new HalloweenManager(),
+//            () -> new HalloweenManager(), pas cette année mon vieux
             QuestProgressSaveManager::new,
             MotdUtils::new,
             MascotsManager::new,
             PlayerSettingsManager::new,
             MailboxManager::new,
             DiscordLinkManager::new,
             ProfileManager::new,
+            CustomStructureManager::new,
+            () -> new HalloweenFestivalManager(),
             () -> new ElevatorManager(),
             () -> new CorpseManager(),
             QuestsManager::new,
@@ -152,7 +156,8 @@ public class OMCPlugin extends JavaPlugin {
             new WorldGuardHook(),
             new ItemsAdderHook(),
             new FancyNpcsHook(),
-            new GitHubHook()
+            new GitHubHook(),
+            new WorldEditHook()
     ));
 
     @Override

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

@@ -14,6 +14,7 @@
 import fr.openmc.core.registry.loottable.CustomLootTableRegistry;
 import fr.openmc.core.registry.mobs.CustomMobRegistry;
 import fr.openmc.core.registry.regions.CustomRegionRegistry;
+import fr.openmc.core.registry.structures.CustomStructureRegistry;
 import fr.openmc.riftengine.api.registry.scanner.ScannerRegistry;
 import fr.openmc.core.registry.worldtemplates.WorldTemplateRegistry;
 import io.papermc.paper.plugin.bootstrap.BootstrapContext;
@@ -32,6 +33,7 @@ public final class OMCRegistry {
     public static CustomLootTableRegistry CUSTOM_LOOT_TABLES;
     public static CustomAmbientRegistry CUSTOM_AMBIENTS;
     public static CustomLootboxRegistry CUSTOM_LOOTBOXES;
+    public static CustomStructureRegistry CUSTOM_STRUCTURES;
     public static CustomRegionRegistry CUSTOM_REGIONS;
     public static WorldTemplateRegistry WORLD_TEMPLATES;
 
@@ -62,6 +64,8 @@ public final class OMCRegistry {
                     RegistryLoadingType.AFTER_IA),
             new RegistryContext(() -> CUSTOM_MOBS = new CustomMobRegistry(),
                     RegistryLoadingType.AFTER_IA),
+            new RegistryContext(() -> CUSTOM_STRUCTURES = new CustomStructureRegistry(),
+                    RegistryLoadingType.AFTER_IA),
             new RegistryContext(() -> WORLD_TEMPLATES = new WorldTemplateRegistry(),
                     RegistryLoadingType.BOOTSTRAP, RegistryLoadingType.RUNTIME),
             new RegistryContext(() -> WEEKLY_EVENTS = new WeeklyEventsRegistry(),

src/main/java/fr/openmc/core/bootstrap/integration/DatapackLoader.java

@@ -1,6 +1,6 @@
 package fr.openmc.core.bootstrap.integration;
 
-import fr.openmc.core.utils.FilesUtils;
+import fr.openmc.core.utils.file.FilesUtils;
 import io.papermc.paper.plugin.bootstrap.BootstrapContext;
 import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
 

src/main/java/fr/openmc/core/bootstrap/integration/ResourcePacksGenerator.java

@@ -1,6 +1,6 @@
 package fr.openmc.core.bootstrap.integration;
 
-import fr.openmc.core.utils.FilesUtils;
+import fr.openmc.core.utils.file.FilesUtils;
 import io.papermc.paper.plugin.bootstrap.BootstrapContext;
 
 import java.io.IOException;

src/main/java/fr/openmc/core/features/dimopener/DimensionOpenerManager.java

@@ -16,7 +16,7 @@
 import fr.openmc.core.features.dimopener.listener.DimensionAccessListener;
 import fr.openmc.core.features.economy.EconomyManager;
 import fr.openmc.core.registry.items.CustomItem;
-import fr.openmc.core.utils.FilesUtils;
+import fr.openmc.core.utils.file.FilesUtils;
 import fr.openmc.core.utils.text.messages.MessageType;
 import fr.openmc.core.utils.text.messages.MessagesManager;
 import fr.openmc.core.utils.text.messages.Prefix;

src/main/java/fr/openmc/core/features/displays/scoreboards/BaseScoreboard.java

@@ -151,7 +151,10 @@ private InfoSwapper getNextInfo() {
 
         infos = infos.stream().filter(InfoSwapper::isActive).toList();
 
-        if (infos.size() <= 1)
+        if (infos.size() == 1)
+            return infos.getFirst();
+
+        if (infos.isEmpty())
             return null;
 
         currentSwappingInfoIndex = (currentSwappingInfoIndex + 1) % infos.size();

src/main/java/fr/openmc/core/features/displays/scoreboards/sb/MainScoreboard.java

@@ -12,8 +12,9 @@
 import fr.openmc.core.features.corpse.npc.CorpseNPCManager;
 import fr.openmc.core.features.displays.scoreboards.BaseScoreboard;
 import fr.openmc.core.features.economy.EconomyManager;
-import fr.openmc.core.features.events.contents.halloween.managers.HalloweenManager;
+import fr.openmc.core.features.events.contents.halloween.pumpkin.managers.HalloweenManager;
 import fr.openmc.core.features.events.sbinfos.ContestInfos;
+import fr.openmc.core.features.events.sbinfos.HalloweenFestivalInfos;
 import fr.openmc.core.hooks.FancyNpcsHook;
 import fr.openmc.core.hooks.LuckPermsHook;
 import fr.openmc.core.hooks.WorldGuardHook;
@@ -71,7 +72,7 @@ public void update(Player player, SternalBoard board) {
     @Override
     protected List<InfoSwapper> getSwapping() {
         return List.of(
-                //new HalloweenFestivalInfos(),
+                new HalloweenFestivalInfos(),
                 new ContestInfos()
         );
     }

src/main/java/fr/openmc/core/features/events/contents/halloween/festival/CandyItem.java

@@ -0,0 +1,37 @@
+package fr.openmc.core.features.events.contents.halloween.festival;
+
+import fr.openmc.core.registry.items.CustomItem;
+import fr.openmc.core.registry.items.CustomItemMeta;
+import fr.openmc.core.utils.text.messages.TranslationManager;
+import lombok.Getter;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+import org.jspecify.annotations.NonNull;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class CandyItem extends CustomItem {
+
+    @Getter
+    public int diabetesIndex;
+    public Material baseItem;
+
+    public static final Map<String, CandyItem> candies = new HashMap<>();
+
+    public CandyItem(String candyID , int diabetesIndex, Material baseItem) {
+        super(new CustomItemMeta(candyID));
+        this.diabetesIndex = diabetesIndex;
+        this.baseItem = baseItem;
+        candies.put(candyID, this);
+    }
+
+    @Override
+    public @NonNull ItemStack getVanilla() {
+        ItemStack item = new ItemStack(baseItem);
+        item.editMeta(meta -> meta.itemName(
+                TranslationManager.translation("itemsadder." + super.getId().replace(":", ".") + ".name")
+        ));
+        return item;
+    }
+}