From 2e8bd01e316f03396394369ed06f0fd8b92ab4d8 Mon Sep 17 00:00:00 2001 From: iambibi_ <89582596+iambibi@users.noreply.github.com> Date: Thu, 18 Dec 2025 17:55:11 +0100 Subject: [PATCH 1/2] fix meteo wand --- .../features/dream/listeners/dream/PlayerSleepListener.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerSleepListener.java b/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerSleepListener.java index 2961a1bec..c3a2a52c0 100644 --- a/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerSleepListener.java +++ b/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerSleepListener.java @@ -49,7 +49,6 @@ public void onPlayerSleep(PlayerBedEnterEvent event) { @EventHandler public void onNightSkip(TimeSkipEvent event) { - for (UUID uuid : playersDreaming) { Player player = Bukkit.getPlayer(uuid); if (player == null) continue; @@ -65,6 +64,6 @@ public void run() { } }.runTaskLater(OMCPlugin.getInstance(), 20L * 5); } - if (event.getSkipReason() == TimeSkipEvent.SkipReason.NIGHT_SKIP) playersDreaming.clear(); + playersDreaming.clear(); } } From 9a4578dafac0ffd6c0f094f643cc7cb93ca1e628 Mon Sep 17 00:00:00 2001 From: iambibi_ <89582596+iambibi@users.noreply.github.com> Date: Thu, 18 Dec 2025 18:08:15 +0100 Subject: [PATCH 2/2] =?UTF-8?q?je=20croise=20les=20fesses=20pour=20que=20?= =?UTF-8?q?=C3=A7a=20marche,=20va=20falloir=20redonner=20les=20books=20au?= =?UTF-8?q?=20joueur=20qui=20en=20ont=20deja?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../features/dream/models/registry/DreamEnchantment.java | 6 ++---- .../dream/registries/DreamEnchantementRegistry.java | 6 ++++++ .../core/features/dream/registries/DreamItemRegistry.java | 3 +++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/fr/openmc/core/features/dream/models/registry/DreamEnchantment.java b/src/main/java/fr/openmc/core/features/dream/models/registry/DreamEnchantment.java index e5dd7c7ae..1f40d8410 100644 --- a/src/main/java/fr/openmc/core/features/dream/models/registry/DreamEnchantment.java +++ b/src/main/java/fr/openmc/core/features/dream/models/registry/DreamEnchantment.java @@ -35,7 +35,7 @@ public abstract class DreamEnchantment { public abstract EnchantmentRegistryEntry.EnchantmentCost getMaximalmCost(); public DreamItem getEnchantedBookItem(int level) { - return new DreamItem(getKey().asMinimalString()) { + return new DreamItem(getKey().asMinimalString() + level) { @Override public ItemStack getVanilla() { return getEnchantedBook(level); @@ -64,9 +64,7 @@ private ItemStack getEnchantedBook(int level) { .registryAccess() .getRegistry(RegistryKey.ENCHANTMENT); - Enchantment enchantment = enchantmentRegistry.getOrThrow( - RegistryKey.ENCHANTMENT.typedKey(getKey()) - ); + Enchantment enchantment = enchantmentRegistry.getOrThrow(RegistryKey.ENCHANTMENT.typedKey(getKey())); meta.addStoredEnchant(enchantment, level, false); bookEnchanted.setItemMeta(meta); diff --git a/src/main/java/fr/openmc/core/features/dream/registries/DreamEnchantementRegistry.java b/src/main/java/fr/openmc/core/features/dream/registries/DreamEnchantementRegistry.java index 2258beb42..30fbcd312 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/DreamEnchantementRegistry.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/DreamEnchantementRegistry.java @@ -61,6 +61,12 @@ public static void init() { dreamEnchantments.put(key, dreamEnchant); enchantments.put(key, enchantment); + for (int level = 1; level <= dreamEnchant.getMaxLevel(); level++) + DreamItemRegistry.register( + key.asMinimalString() + level, + dreamEnchant.getEnchantedBookItem(level) + ); + if (dreamEnchant instanceof Listener listener) { OMCPlugin.registerEvents(listener); } diff --git a/src/main/java/fr/openmc/core/features/dream/registries/DreamItemRegistry.java b/src/main/java/fr/openmc/core/features/dream/registries/DreamItemRegistry.java index f4f5ec9bc..0ad1cb986 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/DreamItemRegistry.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/DreamItemRegistry.java @@ -128,6 +128,9 @@ public static void init() { registerDreamItem(new MeteoWand("omc_dream:meteo_wand")); registerDreamItem(new MetalDetector("omc_dream:metal_detector")); + // # ENCHANTEMENTS + + CommandsManager.getHandler().register( new DreamItemCommand() );