Skip to content

Rewrite OMCPlugin + Reorganisation packages #1243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
iambibi wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Rewrite OMCPlugin + Reorganisation packages #1243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38022ca
Rewrite feature loading + reorganize utils packages
iambibi Apr 7, 2026
14d71cf
fix build
iambibi Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions src/main/java/fr/openmc/api/chronometer/Chronometer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package fr.openmc.api.chronometer;

import fr.openmc.core.OMCPlugin;
import fr.openmc.core.utils.messages.MessageType;
import fr.openmc.core.utils.messages.MessagesManager;
import fr.openmc.core.utils.messages.Prefix;
import fr.openmc.core.utils.text.messages.MessageType;
import fr.openmc.core.utils.text.messages.MessagesManager;
import fr.openmc.core.utils.text.messages.Prefix;
import lombok.Getter;
import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/openmc/api/cooldown/CooldownInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fr.openmc.api.cooldown;

import fr.openmc.core.utils.DateUtils;
import fr.openmc.core.utils.text.DateUtils;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import revxrsal.commands.bukkit.actor.BukkitCommandActor;
Expand Down
15 changes: 12 additions & 3 deletions src/main/java/fr/openmc/api/cooldown/DynamicCooldownManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import com.j256.ormlite.table.DatabaseTable;
import com.j256.ormlite.table.TableUtils;
import fr.openmc.core.OMCPlugin;
import fr.openmc.core.bootstrap.features.Feature;
import fr.openmc.core.bootstrap.features.types.DatabaseFeature;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitTask;
Expand All @@ -20,7 +22,7 @@
/**
* Main class for managing cooldowns
*/
public class DynamicCooldownManager {
public class DynamicCooldownManager extends Feature implements DatabaseFeature {
/**
* Represents a single cooldown with duration and last use time
*/
Expand Down Expand Up @@ -82,16 +84,23 @@ public long getRemaining() {
}
}

public static void init() {
@Override
public void init() {
loadCooldowns();
}

@Override
public void save() {
DynamicCooldownManager.saveCooldowns();
}

// Map structure: UUID -> (Group -> Cooldown)
private static final Map<UUID, Map<String, Cooldown>> cooldowns = new HashMap<>();

private static Dao<Cooldown, String> cooldownDao;

public static void initDB(ConnectionSource connectionSource) throws SQLException {
@Override
public void initDB(ConnectionSource connectionSource) throws SQLException {
TableUtils.createTableIfNotExists(connectionSource, Cooldown.class);
cooldownDao = DaoManager.createDao(connectionSource, Cooldown.class);
}
Expand Down
2 changes: 1 addition & 1 deletion .../openmc/core/utils/dialog/ButtonType.java → ...r/openmc/api/input/dialog/ButtonType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fr.openmc.core.utils.dialog;
package fr.openmc.api.input.dialog;

import lombok.Getter;

Expand Down
3 changes: 1 addition & 2 deletions ...java/fr/openmc/api/input/DialogInput.java → .../openmc/api/input/dialog/DialogInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package fr.openmc.api.input;
package fr.openmc.api.input.dialog;

import fr.openmc.core.utils.dialog.ButtonType;
import io.papermc.paper.dialog.Dialog;
import io.papermc.paper.registry.data.dialog.ActionButton;
import io.papermc.paper.registry.data.dialog.DialogBase;
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/fr/openmc/api/input/location/ItemInteraction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
import fr.openmc.api.chronometer.ChronometerInfo;
import fr.openmc.api.chronometer.ChronometerType;
import fr.openmc.core.OMCPlugin;
import fr.openmc.core.utils.ItemUtils;
import fr.openmc.core.utils.MaterialUtils;
import fr.openmc.core.utils.messages.MessageType;
import fr.openmc.core.utils.messages.MessagesManager;
import fr.openmc.core.utils.messages.Prefix;
import fr.openmc.core.utils.bukkit.ItemUtils;
import fr.openmc.core.utils.bukkit.MaterialUtils;
import fr.openmc.core.utils.text.messages.MessageType;
import fr.openmc.core.utils.text.messages.MessagesManager;
import fr.openmc.core.utils.text.messages.Prefix;
import net.kyori.adventure.text.Component;
import org.bukkit.Location;
import org.bukkit.Material;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/fr/openmc/api/menulib/Menu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import fr.openmc.api.menulib.events.OpenMenuEvent;
import fr.openmc.api.menulib.utils.InventorySize;
import fr.openmc.api.menulib.utils.ItemBuilder;
import fr.openmc.core.utils.ItemUtils;
import fr.openmc.core.utils.messages.MessageType;
import fr.openmc.core.utils.messages.MessagesManager;
import fr.openmc.core.utils.messages.Prefix;
import fr.openmc.core.utils.bukkit.ItemUtils;
import fr.openmc.core.utils.text.messages.MessageType;
import fr.openmc.core.utils.text.messages.MessagesManager;
import fr.openmc.core.utils.text.messages.Prefix;
import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import lombok.Getter;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/openmc/api/menulib/MenuLib.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import fr.openmc.api.menulib.utils.ItemBuilder;
import fr.openmc.core.OMCPlugin;
import fr.openmc.core.features.homes.menu.HomeDeleteConfirmMenu;
import fr.openmc.core.utils.ItemUtils;
import fr.openmc.core.utils.bukkit.ItemUtils;
import lombok.Getter;
import org.bukkit.Bukkit;
import org.bukkit.NamespacedKey;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/fr/openmc/api/menulib/template/ConfirmMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import fr.openmc.api.menulib.utils.InventorySize;
import fr.openmc.api.menulib.utils.ItemBuilder;
import fr.openmc.core.registry.items.CustomItemRegistry;
import fr.openmc.core.utils.messages.MessageType;
import fr.openmc.core.utils.messages.MessagesManager;
import fr.openmc.core.utils.messages.Prefix;
import fr.openmc.core.utils.text.messages.MessageType;
import fr.openmc.core.utils.text.messages.MessagesManager;
import fr.openmc.core.utils.text.messages.Prefix;
import net.kyori.adventure.text.Component;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryClickEvent;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/fr/openmc/api/menulib/utils/ItemBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import fr.openmc.api.menulib.MenuLib;
import fr.openmc.api.menulib.PaginatedMenu;
import fr.openmc.core.OMCPlugin;
import fr.openmc.core.utils.messages.MessageType;
import fr.openmc.core.utils.messages.MessagesManager;
import fr.openmc.core.utils.messages.Prefix;
import fr.openmc.core.utils.text.messages.MessageType;
import fr.openmc.core.utils.text.messages.MessagesManager;
import fr.openmc.core.utils.text.messages.Prefix;
import io.papermc.paper.datacomponent.DataComponentType;
import io.papermc.paper.datacomponent.DataComponentTypes;
import io.papermc.paper.datacomponent.item.TooltipDisplay;
Expand Down
Loading
Loading