iambibi · Aug 30, 2026 · Aug 31, 2026 · Sep 4, 2026 · Sep 4, 2026 · Sep 12, 2026
diff --git a/build.gradle b/build.gradle
@@ -28,26 +28,34 @@ group = 'fr.openmc'
 
 repositories {
     mavenCentral()
+    // * PlaceholderAPI
     maven {
         url "https://repo.extendedclip.com/content/repositories/placeholderapi/"
     }
+    // * WorldGuard & WorldEdit
     maven {
         url "https://maven.enginehub.org/repo/"
     }
+    // * FancyNpc
     maven {
         url "https://repo.fancyinnovations.com/releases"
     }
+    // * PaperMC
     maven {
         url = "https://repo.papermc.io/repository/maven-public/"
     }
+    // * GeyserMC
+    maven {
+        url "https://repo.opencollab.dev/main/"
+    }
+    // * ItemsAdder
     maven {
         url "https://maven.devs.beer/"
     }
+    // * ProtocolLib
     maven {
         url "https://repo.dmulloy2.net/repository/public/"
     }
-    // * GeyserMC
-    //maven {url "https://repo.opencollab.dev/main/"}
     maven {
         url "https://jitpack.io" // Toujours à la fin
     }
@@ -71,9 +79,9 @@ dependencies {
     compileOnly "net.dmulloy2:ProtocolLib:${protocolLibVersion}"
 
     // Bedrock Dependencies
-    //compileOnly files("libs/RiftEngine-${riftEngineVersion}.jar")
-    //compileOnly "org.geysermc.geyser:api:${geyserApiVersion}"
-    //compileOnly "org.geysermc.floodgate:api:${floodgateApiVersion}"
+    compileOnly files("libs/RiftEngine-${riftEngineVersion}.jar")
+    compileOnly "org.geysermc.geyser:api:${geyserApiVersion}"
+    compileOnly "org.geysermc.floodgate:api:${floodgateApiVersion}"
 
     implementation "org.jetbrains:annotations:${jetbrainsAnnotationsVersion}"
     implementation "io.github.revxrsal:lamp.common:${revxrsalLampVersion}"

diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ protocolLibVersion = 5.4.0
 
 # Dependencies
 jetbrainsAnnotationsVersion = 26.1.0
-revxrsalLampVersion = 4.0.0-rc.18
+revxrsalLampVersion = 4.0.0-rc.19
 ormVersion = 6.1
 lombokVersion = 1.18.48
 

diff --git a/local.properties b/local.properties
@@ -1 +1 @@
-minecraftServerDir=/home/iambibi_/Documents/ServeurMinecraftLocal/26.3-OMC
+minecraftServerDir=/home/iambibi_/Documents/ServeurMinecraftLocal/26.3-OMC-Rift
diff --git a/src/main/java/fr/openmc/core/OMCPlugin.java b/src/main/java/fr/openmc/core/OMCPlugin.java
@@ -221,11 +221,11 @@ public void loadAfterItemsAdder() {
         ItemsAddersListener.setLoaded(true);
 
         // todo: a rewrite lors registre hook et features
-//        try {
-//            new BedrockHook().startInit();
-//        } catch (NoClassDefFoundError e) {
-//            OMCLogger.error("Hook BedrockHook désactivé (package non trouvé) " + e.getMessage());
-//        }
+        try {
+            new BedrockHook().startInit();
+        } catch (NoClassDefFoundError e) {
+            OMCLogger.error("Hook BedrockHook désactivé (package non trouvé) " + e.getMessage());
+        }
 
         /* LOAD ITEMS ADDER CONTENTS */
         ItemsAdderHook.loadContents();

diff --git a/src/main/java/fr/openmc/core/OMCRegistry.java b/src/main/java/fr/openmc/core/OMCRegistry.java
@@ -14,8 +14,8 @@
 import fr.openmc.core.registry.loottable.CustomLootTableRegistry;
 import fr.openmc.core.registry.mobs.CustomMobRegistry;
 import fr.openmc.core.registry.regions.CustomRegionRegistry;
-import fr.openmc.riftengine.api.registry.scanner.ScannerRegistry;
 import fr.openmc.core.registry.worldtemplates.WorldTemplateRegistry;
+import fr.openmc.riftengine.api.registry.scanner.ScannerRegistry;
 import io.papermc.paper.plugin.bootstrap.BootstrapContext;
 
 import java.io.IOException;
@@ -87,7 +87,7 @@ public static void bootstrapAll(BootstrapContext context) {
                 r.bootstrap(context);
             } catch (IOException e) {
                 OMCLogger.errorFormatted("Erreur lors du chargement du registre lors du bootstrap");
-                OMCLogger.error(e.getMessage());
+                OMCLogger.error(e.getMessage(), e);
             }
             OMCLogger.successFormatted("Registre {} chargé pendant le bootstrap", r.getClass().getSimpleName());
         }
@@ -108,7 +108,7 @@ public static void initAll() {
                 r.init();
             } catch (Exception e) {
                 OMCLogger.errorFormatted("Erreur lors du chargement du registre lors du runtime");
-                OMCLogger.error(e.getMessage());
+                OMCLogger.error(e.getMessage(), e);
             }
             OMCLogger.successFormatted("Registre {} chargé pendant le runtime", r.getClass().getSimpleName());
         }
@@ -130,7 +130,7 @@ public static void postInitAll() {
                 r.postInit();
             } catch (Exception e) {
                 OMCLogger.errorFormatted("Erreur lors du chargement du registre apres ItemsAdder");
-                OMCLogger.error(e.getMessage());
+                OMCLogger.error(e.getMessage(), e);
             }
 
             OMCLogger.successFormatted("Registre {} chargé après ItemsAdder", r.getClass().getSimpleName());

diff --git a/src/main/java/fr/openmc/core/features/bits/BitsManager.java b/src/main/java/fr/openmc/core/features/bits/BitsManager.java
@@ -14,16 +14,15 @@
 import fr.openmc.core.features.bits.commands.BitsCommands;
 import fr.openmc.core.features.bits.models.BitsPlayer;
 import fr.openmc.core.features.city.sub.bank.CityBankManager;
+import fr.openmc.core.features.economy.EconomyManager;
 import fr.openmc.core.hooks.github.GitHubHook;
 import fr.openmc.core.hooks.github.models.ContributorStats;
 import fr.openmc.core.hooks.itemsadder.ItemsAdderHook;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.scheduler.BukkitTask;
 
-import java.math.BigDecimal;
 import java.sql.SQLException;
-import java.text.NumberFormat;
 import java.util.*;
 
 @Credit(developers = {"iambibi_"})
@@ -117,13 +116,7 @@ public static BitsPlayer getBitsPlayer(UUID playerUUID) {
     }
 
     public static String getFormattedBits(UUID playerUUID) {
-        String balance = String.valueOf(getBits(playerUUID));
-        Currency currency = Currency.getInstance(Locale.FRANCE);
-        NumberFormat format = NumberFormat.getCurrencyInstance(Locale.FRANCE);
-        format.setCurrency(currency);
-        BigDecimal bd = new BigDecimal(balance);
-        return format.format(bd).replace(NumberFormat.getCurrencyInstance(Locale.FRANCE).getCurrency().getSymbol(),
-                getBitsIcon());
+        return EconomyManager.getFormattedNumber(getBits(playerUUID));
     }
 
     public static String getBitsIcon() {

diff --git a/src/main/java/fr/openmc/core/features/city/menu/CityTopMenu.java b/src/main/java/fr/openmc/core/features/city/menu/CityTopMenu.java
@@ -92,7 +92,7 @@ public List<ItemStack> getItems() {
                 Component membersCurrent = Component.text(city.getMembers().size()).color(NamedTextColor.GREEN);
                 Component membersLimit = Component.text(MemberLimitRewards.getMemberLimit(city.getLevel())).color(NamedTextColor.GREEN);
                 Component areaComponent = Component.text(city.getChunks().size()).color(NamedTextColor.GOLD);
-                Component wealthComponent = Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance())).color(NamedTextColor.GOLD);
+                Component wealthComponent = Component.text(EconomyManager.getFormattedNumber(city.getBalance())).color(NamedTextColor.GOLD);
                 Component wealthIcon = Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.GOLD);
                 Component powerComponent = Component.text(city.getPowerPoints()).color(NamedTextColor.RED);
 

diff --git a/src/main/java/fr/openmc/core/features/city/menu/list/CityListDetailsMenu.java b/src/main/java/fr/openmc/core/features/city/menu/list/CityListDetailsMenu.java
@@ -158,7 +158,7 @@ public void onInventoryClick(InventoryClickEvent inventoryClickEvent) {
 		map.put(22, new ItemMenuBuilder(this, new ItemStack(Material.DIAMOND),
 				itemMeta -> itemMeta.displayName(TranslationManager.translation(
 						"feature.city.menus.list.details.wealth",
-						Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance())).color(NamedTextColor.GOLD),
+						Component.text(EconomyManager.getFormattedNumber(city.getBalance())).color(NamedTextColor.GOLD),
 						Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.GOLD)
 				))));
 

diff --git a/src/main/java/fr/openmc/core/features/city/menu/list/CityListMenu.java b/src/main/java/fr/openmc/core/features/city/menu/list/CityListMenu.java
@@ -89,7 +89,7 @@ public List<ItemStack> getItems() {
 			Component membersLimit = Component.text(MemberLimitRewards.getMemberLimit(city.getLevel())).color(NamedTextColor.GREEN);
 			Component membersSuffix = Component.text(city.getMembers().size() > 1 ? "s" : "");
 			Component typeComponent = city.getType().getDisplayName();
-			Component wealthComponent = Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance())).color(NamedTextColor.GOLD);
+			Component wealthComponent = Component.text(EconomyManager.getFormattedNumber(city.getBalance())).color(NamedTextColor.GOLD);
 			Component wealthIcon = Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.GOLD);
 			if (MayorManager.phaseMayor == 2 && FeaturesRewards.hasUnlockFeature(city, FeaturesRewards.Feature.MAYOR)) {
 				Component mayorCity = city.getMayor() == null

diff --git a/src/main/java/fr/openmc/core/features/city/menu/main/buttons/NotationsButton.java b/src/main/java/fr/openmc/core/features/city/menu/main/buttons/NotationsButton.java
@@ -47,7 +47,7 @@ private static List<Component> getDynamicLore(City city, CityNotation notation)
                     "feature.city.menus.main.notation.lore",
                     Component.text(Math.floor(notation.getTotalNote())).color(NamedTextColor.BLUE),
                     Component.text(NotationNote.getMaxTotalNote()).color(NamedTextColor.BLUE),
-                    Component.text(EconomyManager.getFormattedSimplifiedNumber(notation.getMoney())).color(NamedTextColor.GOLD),
+                    Component.text(EconomyManager.getFormattedNumber(notation.getMoney())).color(NamedTextColor.GOLD),
                     Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.GOLD)
             );
         } else {

diff --git a/src/main/java/fr/openmc/core/features/city/sub/bank/CityBankManager.java b/src/main/java/fr/openmc/core/features/city/sub/bank/CityBankManager.java
@@ -104,7 +104,7 @@ public static void withdrawCityBank(City city, Player player, String input) {
         MessagesManager.sendMessage(player,
                 TranslationManager.translation(
                         "feature.city.bank.withdraw.success",
-                        Component.text(EconomyManager.getFormattedSimplifiedNumber(amount)).color(NamedTextColor.LIGHT_PURPLE),
+                        Component.text(EconomyManager.getFormattedNumber(amount)).color(NamedTextColor.LIGHT_PURPLE),
                         Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.LIGHT_PURPLE)
                 ),
                 Prefix.CITY, MessageType.SUCCESS, false);

diff --git a/src/main/java/fr/openmc/core/features/city/sub/bank/menu/CityBankDepositMenu.java b/src/main/java/fr/openmc/core/features/city/sub/bank/menu/CityBankDepositMenu.java
@@ -69,7 +69,7 @@ public void onInventoryClick(InventoryClickEvent click) {
         if (hasPermissionMoneyGive) {
             loreBankDepositAll = TranslationManager.translationLore(
                     "feature.city.bank.menu.deposit.all.lore",
-                    Component.text(EconomyManager.getFormattedSimplifiedNumber(moneyPlayer)).color(NamedTextColor.LIGHT_PURPLE),
+                    Component.text(EconomyManager.getFormattedNumber(moneyPlayer)).color(NamedTextColor.LIGHT_PURPLE),
                     Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.LIGHT_PURPLE)
             );
         } else {
@@ -90,7 +90,7 @@ public void onInventoryClick(InventoryClickEvent click) {
         if (hasPermissionMoneyGive) {
             loreBankDepositHalf = TranslationManager.translationLore(
                     "feature.city.bank.menu.deposit.half.lore",
-                    Component.text(EconomyManager.getFormattedSimplifiedNumber(halfMoneyPlayer)).color(NamedTextColor.LIGHT_PURPLE),
+                    Component.text(EconomyManager.getFormattedNumber(halfMoneyPlayer)).color(NamedTextColor.LIGHT_PURPLE),
                     Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.LIGHT_PURPLE)
             );
         } else {

diff --git a/src/main/java/fr/openmc/core/features/city/sub/bank/menu/CityBankMenu.java b/src/main/java/fr/openmc/core/features/city/sub/bank/menu/CityBankMenu.java
@@ -91,7 +91,7 @@ public void onInventoryClick(InventoryClickEvent click) {
                 itemMeta.itemName(TranslationManager.translation("feature.city.bank.menu.balance.title"));
                 itemMeta.lore(TranslationManager.translationLore(
                         "feature.city.bank.menu.balance.lore",
-                        Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance())).color(NamedTextColor.LIGHT_PURPLE),
+                        Component.text(EconomyManager.getFormattedNumber(city.getBalance())).color(NamedTextColor.LIGHT_PURPLE),
                         Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.LIGHT_PURPLE),
                         Component.text(city.calculateCityInterest() * 100 + "%").color(NamedTextColor.AQUA),
                         Component.text(DateUtils.convertSecondToTime(BankManager.getSecondsUntilInterest())).color(NamedTextColor.AQUA)

diff --git a/src/main/java/fr/openmc/core/features/city/sub/bank/menu/CityBankWithdrawMenu.java b/src/main/java/fr/openmc/core/features/city/sub/bank/menu/CityBankWithdrawMenu.java
@@ -69,7 +69,7 @@ public void onInventoryClick(InventoryClickEvent click) {
         if (hasPermissionMoneyTake) {
             loreBankWithdrawAll = TranslationManager.translationLore(
                     "feature.city.bank.menu.withdraw.all.lore",
-                    Component.text(EconomyManager.getFormattedSimplifiedNumber(moneyBankCity)).color(NamedTextColor.LIGHT_PURPLE),
+                    Component.text(EconomyManager.getFormattedNumber(moneyBankCity)).color(NamedTextColor.LIGHT_PURPLE),
                     Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.LIGHT_PURPLE)
             );
         } else {
@@ -89,7 +89,7 @@ public void onInventoryClick(InventoryClickEvent click) {
         if (hasPermissionMoneyTake) {
             loreBankWithdrawHalf = TranslationManager.translationLore(
                     "feature.city.bank.menu.withdraw.half.lore",
-                    Component.text(EconomyManager.getFormattedSimplifiedNumber(halfMoneyBankCity)).color(NamedTextColor.LIGHT_PURPLE),
+                    Component.text(EconomyManager.getFormattedNumber(halfMoneyBankCity)).color(NamedTextColor.LIGHT_PURPLE),
                     Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.LIGHT_PURPLE)
             );
         } else {

diff --git a/src/main/java/fr/openmc/core/features/city/sub/milestone/CityLevels.java b/src/main/java/fr/openmc/core/features/city/sub/milestone/CityLevels.java
@@ -127,7 +127,7 @@ public enum CityLevels {
                                 return TranslationManager.translation(
                                         "feature.city.levels.requirements.bank.progress",
                                         Component.text("5k"),
-                                        Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance()))
+                                        Component.text(EconomyManager.getFormattedNumber(city.getBalance()))
                                 );
                             }
                     ),
@@ -214,7 +214,7 @@ public enum CityLevels {
                                 return TranslationManager.translation(
                                         "feature.city.levels.requirements.bank.progress",
                                         Component.text("15k"),
-                                        Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance()))
+                                        Component.text(EconomyManager.getFormattedNumber(city.getBalance()))
                                 );
                             }
                     ),
@@ -294,7 +294,7 @@ public enum CityLevels {
                                 return TranslationManager.translation(
                                         "feature.city.levels.requirements.bank.progress",
                                         Component.text("20k"),
-                                        Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance()))
+                                        Component.text(EconomyManager.getFormattedNumber(city.getBalance()))
                                 );
                             }
                     ),
@@ -364,7 +364,7 @@ public enum CityLevels {
                                 return TranslationManager.translation(
                                         "feature.city.levels.requirements.bank.progress",
                                         Component.text("30k"),
-                                        Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance()))
+                                        Component.text(EconomyManager.getFormattedNumber(city.getBalance()))
                                 );
                             }
                     ),
@@ -455,7 +455,7 @@ public enum CityLevels {
                                 return TranslationManager.translation(
                                         "feature.city.levels.requirements.bank.progress",
                                         Component.text("40k"),
-                                        Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance()))
+                                        Component.text(EconomyManager.getFormattedNumber(city.getBalance()))
                                 );
                             }
                     ),
@@ -528,7 +528,7 @@ public enum CityLevels {
                                 return TranslationManager.translation(
                                         "feature.city.levels.requirements.bank.progress",
                                         Component.text("60k"),
-                                        Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance()))
+                                        Component.text(EconomyManager.getFormattedNumber(city.getBalance()))
                                 );
                             }
                     ),
@@ -620,7 +620,7 @@ public enum CityLevels {
                                 return TranslationManager.translation(
                                         "feature.city.levels.requirements.bank.progress",
                                         Component.text("80k"),
-                                        Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance()))
+                                        Component.text(EconomyManager.getFormattedNumber(city.getBalance()))
                                 );
                             }
                     ),
@@ -700,7 +700,7 @@ public enum CityLevels {
                                 return TranslationManager.translation(
                                         "feature.city.levels.requirements.bank.progress",
                                         Component.text("200k"),
-                                        Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance()))
+                                        Component.text(EconomyManager.getFormattedNumber(city.getBalance()))
                                 );
                             }
                     ),

diff --git a/src/main/java/fr/openmc/core/features/city/sub/war/WarManager.java b/src/main/java/fr/openmc/core/features/city/sub/war/WarManager.java
@@ -332,14 +332,14 @@ public static void broadcastWarResult(War war, City winner, City loser, WinReaso
         Component rewardMoney = bonusMoney > 0
                 ? TranslationManager.translation(
                         "feature.city.war.result.reward.money_bonus",
-                        Component.text(EconomyManager.getFormattedSimplifiedNumber(amountStolen) + EconomyManager.getEconomyIcon())
+                        Component.text(EconomyManager.getFormattedNumber(amountStolen) + EconomyManager.getEconomyIcon())
                                 .color(NamedTextColor.GOLD),
-                        Component.text(EconomyManager.getFormattedSimplifiedNumber(bonusMoney) + EconomyManager.getEconomyIcon())
+                        Component.text(EconomyManager.getFormattedNumber(bonusMoney) + EconomyManager.getEconomyIcon())
                                 .color(NamedTextColor.GOLD)
                 )
                 : TranslationManager.translation(
                         "feature.city.war.result.reward.money",
-                        Component.text(EconomyManager.getFormattedSimplifiedNumber(amountStolen) + EconomyManager.getEconomyIcon())
+                        Component.text(EconomyManager.getFormattedNumber(amountStolen) + EconomyManager.getEconomyIcon())
                                 .color(NamedTextColor.GOLD)
                 );
         Component rewardClaims = TranslationManager.translation(
@@ -378,7 +378,7 @@ public static void broadcastWarResult(War war, City winner, City loser, WinReaso
         );
         Component lossMoney = TranslationManager.translation(
                 "feature.city.war.result.loss.money",
-                Component.text(EconomyManager.getFormattedSimplifiedNumber(amountStolen) + EconomyManager.getEconomyIcon())
+                Component.text(EconomyManager.getFormattedNumber(amountStolen) + EconomyManager.getEconomyIcon())
                         .color(NamedTextColor.RED)
         );
         Component lossClaims = TranslationManager.translation(
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		minecraftServerDir=/home/iambibi_/Documents/ServeurMinecraftLocal/26.3-OMC
		minecraftServerDir=/home/iambibi_/Documents/ServeurMinecraftLocal/26.3-OMC-Rift