Ajout d'une base pour les évenements de week end (rotation entre les events, calendrier)

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

@@ -11,7 +11,8 @@
 import fr.openmc.core.features.animations.DebugAnimationCommand;
 import fr.openmc.core.features.credits.CreditsCommand;
 import fr.openmc.core.features.cube.CubeCommands;
-import fr.openmc.core.features.events.halloween.commands.HalloweenCommands;
+import fr.openmc.core.features.events.commands.EventCommand;
+import fr.openmc.core.features.events.contents.halloween.commands.HalloweenCommands;
 import fr.openmc.core.features.friend.FriendCommand;
 import fr.openmc.core.features.mailboxes.MailboxCommand;
 import fr.openmc.core.features.mainmenu.commands.MainMenuCommand;
@@ -61,7 +62,8 @@ private static void registerCommands() {
                 new CreditsCommand(),
                 new CubeCommands(),
                 new HalloweenCommands(),
-                new DebugAnimationCommand()
+                new DebugAnimationCommand(),
+                new EventCommand()
         );
     }
 }

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

@@ -15,7 +15,6 @@
 import fr.openmc.core.features.city.sub.notation.NotationManager;
 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.cube.multiblocks.MultiBlockManager;
 import fr.openmc.core.features.displays.TabList;
 import fr.openmc.core.features.displays.bossbar.BossbarManager;
@@ -25,7 +24,9 @@
 import fr.openmc.core.features.dream.generation.DreamDimensionManager;
 import fr.openmc.core.features.economy.BankManager;
 import fr.openmc.core.features.economy.EconomyManager;
-import fr.openmc.core.features.events.halloween.managers.HalloweenManager;
+import fr.openmc.core.features.events.contents.halloween.managers.HalloweenManager;
+import fr.openmc.core.features.events.contents.weeklyevents.WeeklyEventsManager;
+import fr.openmc.core.features.events.contents.weeklyevents.contents.contest.managers.ContestManager;
 import fr.openmc.core.features.homes.HomesManager;
 import fr.openmc.core.features.homes.icons.HomeIconCacheManager;
 import fr.openmc.core.features.leaderboards.LeaderboardManager;
@@ -161,6 +162,7 @@ public void loadWithItemsAdder() {
 	    QuestsManager.init();
         CityManager.init();
         ContestManager.init();
+        WeeklyEventsManager.init();
         DreamManager.init();
         MultiBlockManager.init();
         if (WorldGuardHook.isHasWorldGuard()) {

src/main/java/fr/openmc/core/features/city/sub/notation/NotationManager.java

@@ -338,7 +338,7 @@ public static void giveReward(String weekStr) {
      * Planifie l'exécution de la tâche de minuit qui calcule les scores et attribue les récompenses.
      */
     private static void scheduleMidnightTask() {
-        long delayInTicks = DateUtils.getSecondsUntilDayOfWeekMidnight(APPLY_NOTATION_DAY) * 20;
+        long delayInTicks = DateUtils.getSecondsUntilDayOfWeekTime(APPLY_NOTATION_DAY, 0, 0, 0) * 20;
         Bukkit.getScheduler().runTaskLater(OMCPlugin.getInstance(), () -> {
             if (!isApplied) {
                 String weekStr = DateUtils.getWeekFormat();

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

@@ -9,11 +9,14 @@
 import fr.openmc.api.scoreboard.SternalBoard;
 import fr.openmc.core.features.city.City;
 import fr.openmc.core.features.city.CityManager;
-import fr.openmc.core.features.contest.managers.ContestManager;
-import fr.openmc.core.features.contest.models.Contest;
 import fr.openmc.core.features.displays.scoreboards.BaseScoreboard;
 import fr.openmc.core.features.economy.EconomyManager;
-import fr.openmc.core.features.events.halloween.managers.HalloweenManager;
+import fr.openmc.core.features.events.contents.halloween.managers.HalloweenManager;
+import fr.openmc.core.features.events.contents.weeklyevents.WeeklyEventsManager;
+import fr.openmc.core.features.events.contents.weeklyevents.contents.contest.Contest;
+import fr.openmc.core.features.events.contents.weeklyevents.contents.contest.ContestPhase;
+import fr.openmc.core.features.events.contents.weeklyevents.contents.contest.managers.ContestManager;
+import fr.openmc.core.features.events.contents.weeklyevents.contents.contest.models.ContestData;
 import fr.openmc.core.utils.DateUtils;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
@@ -40,19 +43,21 @@ public void update(Player player, SternalBoard board) {
         List<Component> lines = new ArrayList<>(getDefaultLines(player));
 
         // Contest
-        Contest data = ContestManager.data;
-        if (data.getPhase() != 1) {
-            lines.add(MiniMessage.miniMessage().deserialize("<gradient:#FFB800:#F0DF49>%s</gradient>".formatted(textToSmall("contest"))).decoration(TextDecoration.BOLD, true));
-            lines.add(text("  • ", NamedTextColor.DARK_GRAY)
-                    .append(text(textToSmall(data.getCamp1()), data.getColor1AsNamedTextColor()))
-                    .append(text(textToSmall(" VS "), NamedTextColor.GRAY))
-                    .append(text(textToSmall(data.getCamp2()), data.getColor2AsNamedTextColor()))
-            );
-            lines.add(Component.text("  • ", NamedTextColor.DARK_GRAY)
-                    .append(Component.text(textToSmall("fin:"), NamedTextColor.GRAY))
-                    .appendSpace()
-                    .append(text(DateUtils.getTimeUntilNextDay(DayOfWeek.MONDAY), TextColor.color(0xFF8F06)))
-            );
+        if (WeeklyEventsManager.getCurrentEvent() instanceof Contest) {
+            ContestData data = ContestManager.data;
+            if (WeeklyEventsManager.getCurrentPhase() != ContestPhase.VOTE_CAMP.getPhase()) {
+                lines.add(MiniMessage.miniMessage().deserialize("<gradient:#FFB800:#F0DF49>%s</gradient>".formatted(textToSmall("contest"))).decoration(TextDecoration.BOLD, true));
+                lines.add(text("  • ", NamedTextColor.DARK_GRAY)
+                        .append(text(textToSmall(data.getCamp1()), data.getColor1AsNamedTextColor()))
+                        .append(text(textToSmall(" VS "), NamedTextColor.GRAY))
+                        .append(text(textToSmall(data.getCamp2()), data.getColor2AsNamedTextColor()))
+                );
+                lines.add(Component.text("  • ", NamedTextColor.DARK_GRAY)
+                        .append(Component.text(textToSmall("fin:"), NamedTextColor.GRAY))
+                        .appendSpace()
+                        .append(text(DateUtils.getTimeUntilNextDay(DayOfWeek.MONDAY), TextColor.color(0xFF8F06)))
+                );
+            }
         }
 
         lines.add(empty());

src/main/java/fr/openmc/core/features/events/commands/EventCommand.java

@@ -0,0 +1,18 @@
+package fr.openmc.core.features.events.commands;
+
+import fr.openmc.core.features.events.menus.CalendarMenu;
+import org.bukkit.entity.Player;
+import revxrsal.commands.annotation.Command;
+import revxrsal.commands.annotation.CommandPlaceholder;
+import revxrsal.commands.annotation.Cooldown;
+import revxrsal.commands.annotation.Description;
+
+@Command("events")
+@Description("Ouvre l'interface des événement (journalier et weekly")
+public class EventCommand {
+    @Cooldown(2)
+    @CommandPlaceholder()
+    public static void mainCommand(Player player) {
+        new CalendarMenu(player).open();
+    }
+}

src/main/java/fr/openmc/core/features/events/halloween/commands/HalloweenCommands.java → src/main/java/fr/openmc/core/features/events/contents/halloween/commands/HalloweenCommands.java

@@ -1,6 +1,6 @@
-package fr.openmc.core.features.events.halloween.commands;
+package fr.openmc.core.features.events.contents.halloween.commands;
 
-import fr.openmc.core.features.events.halloween.managers.HalloweenManager;
+import fr.openmc.core.features.events.contents.halloween.managers.HalloweenManager;
 import revxrsal.commands.annotation.Command;
 import revxrsal.commands.annotation.Subcommand;
 import revxrsal.commands.bukkit.annotation.CommandPermission;

src/main/java/fr/openmc/core/features/events/halloween/listeners/HalloweenNPCListener.java → src/main/java/fr/openmc/core/features/events/contents/halloween/listeners/HalloweenNPCListener.java

@@ -1,7 +1,7 @@
-package fr.openmc.core.features.events.halloween.listeners;
+package fr.openmc.core.features.events.contents.halloween.listeners;
 
 import de.oliver.fancynpcs.api.events.NpcInteractEvent;
-import fr.openmc.core.features.events.halloween.menus.HalloweenPumpkinDepositMenu;
+import fr.openmc.core.features.events.contents.halloween.menus.HalloweenPumpkinDepositMenu;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;

src/main/java/fr/openmc/core/features/events/halloween/managers/HalloweenManager.java → src/main/java/fr/openmc/core/features/events/contents/halloween/managers/HalloweenManager.java

@@ -1,4 +1,4 @@
-package fr.openmc.core.features.events.halloween.managers;
+package fr.openmc.core.features.events.contents.halloween.managers;
 
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
@@ -10,8 +10,8 @@
 import fr.openmc.api.hooks.FancyNpcsHook;
 import fr.openmc.core.OMCPlugin;
 import fr.openmc.core.features.economy.EconomyManager;
-import fr.openmc.core.features.events.halloween.listeners.HalloweenNPCListener;
-import fr.openmc.core.features.events.halloween.models.HalloweenData;
+import fr.openmc.core.features.events.contents.halloween.listeners.HalloweenNPCListener;
+import fr.openmc.core.features.events.contents.halloween.models.HalloweenData;
 import fr.openmc.core.features.leaderboards.LeaderboardManager;
 import fr.openmc.core.features.mailboxes.MailboxManager;
 import fr.openmc.core.registry.items.CustomItemRegistry;

src/main/java/fr/openmc/core/features/events/halloween/menus/HalloweenPumpkinDepositMenu.java → src/main/java/fr/openmc/core/features/events/contents/halloween/menus/HalloweenPumpkinDepositMenu.java

@@ -1,9 +1,9 @@
-package fr.openmc.core.features.events.halloween.menus;
+package fr.openmc.core.features.events.contents.halloween.menus;
 
 import fr.openmc.api.menulib.Menu;
 import fr.openmc.api.menulib.utils.InventorySize;
 import fr.openmc.api.menulib.utils.ItemBuilder;
-import fr.openmc.core.features.events.halloween.managers.HalloweenManager;
+import fr.openmc.core.features.events.contents.halloween.managers.HalloweenManager;
 import fr.openmc.core.utils.ItemUtils;
 import fr.openmc.core.utils.messages.MessageType;
 import fr.openmc.core.utils.messages.MessagesManager;

src/main/java/fr/openmc/core/features/events/halloween/models/HalloweenData.java → src/main/java/fr/openmc/core/features/events/contents/halloween/models/HalloweenData.java

@@ -1,4 +1,4 @@
-package fr.openmc.core.features.events.halloween.models;
+package fr.openmc.core.features.events.contents.halloween.models;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;