Skip to content

Correctif meteo wand and book dans singu #1119

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

Merged
iambibi merged 2 commits into from
Dec 18, 2025
Merged

Correctif meteo wand and book dans singu #1119

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
2e8bd01
fix meteo wand
iambibi Dec 18, 2025
9a4578d
je croise les fesses pour que ça marche, va falloir redonner les book…
iambibi Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerSleepListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -65,6 +64,6 @@ public void run() {
}
}.runTaskLater(OMCPlugin.getInstance(), 20L * 5);
}
if (event.getSkipReason() == TimeSkipEvent.SkipReason.NIGHT_SKIP) playersDreaming.clear();
playersDreaming.clear();
}
}
6 changes: 2 additions & 4 deletions src/main/java/fr/openmc/core/features/dream/models/registry/DreamEnchantment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/fr/openmc/core/features/dream/registries/DreamEnchantementRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/fr/openmc/core/features/dream/registries/DreamItemRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
);
Expand Down
Loading