diff --git a/src/main/java/fr/openmc/core/features/displays/bossbar/BossbarManager.java b/src/main/java/fr/openmc/core/features/displays/bossbar/BossbarManager.java index 42531b961..2e233905d 100644 --- a/src/main/java/fr/openmc/core/features/displays/bossbar/BossbarManager.java +++ b/src/main/java/fr/openmc/core/features/displays/bossbar/BossbarManager.java @@ -108,7 +108,7 @@ private static void updatePlayer(Player player) { playerBars.put(id, existing); base.update(player, existing); - existing.progress(base.progress(player)); + existing.progress(Math.clamp(base.progress(player), 0f, 1f)); playerLastUpdate.put(id, now); continue; } @@ -118,7 +118,7 @@ private static void updatePlayer(Player player) { if (now - last >= intervalMillis) { base.update(player, existing); - existing.progress(base.progress(player)); + existing.progress(Math.clamp(base.progress(player), 0f, 1f)); playerLastUpdate.put(id, now); } diff --git a/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/CokkedPoissonion.java b/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/CokkedPoissonion.java index 8add6242a..0ddf07108 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/CokkedPoissonion.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/CokkedPoissonion.java @@ -13,7 +13,7 @@ public CokkedPoissonion() { "omc_dream:cooked_poissonion", TranslationManager.translation("feature.dream.item.cooked_poissonion.name"), DreamRarity.RARE, - Material.COOKED_COD, + Material.PAPER, true )); } diff --git a/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/DockerFish.java b/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/DockerFish.java index e756e3c48..155765266 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/DockerFish.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/DockerFish.java @@ -13,7 +13,7 @@ public DockerFish() { "omc_dream:dockerfish", TranslationManager.translation("feature.dream.item.dockerfish.name"), DreamRarity.RARE, - Material.COD, + Material.PAPER, true )); } diff --git a/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/MoonFish.java b/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/MoonFish.java index c578e23f6..f64e2b81d 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/MoonFish.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/MoonFish.java @@ -13,7 +13,7 @@ public MoonFish() { "omc_dream:moon_fish", TranslationManager.translation("feature.dream.item.moon_fish.name"), DreamRarity.RARE, - Material.SALMON, + Material.PAPER, true )); } diff --git a/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/Poissonion.java b/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/Poissonion.java index e8bca932a..0ae85b006 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/Poissonion.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/Poissonion.java @@ -13,7 +13,7 @@ public Poissonion() { "omc_dream:poissonion", TranslationManager.translation("feature.dream.item.poissonion.name"), DreamRarity.RARE, - Material.COD, + Material.PAPER, true )); } diff --git a/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/SunFish.java b/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/SunFish.java index f801735c8..780d9eed0 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/SunFish.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/items/fishes/SunFish.java @@ -13,7 +13,7 @@ public SunFish() { "omc_dream:sun_fish", TranslationManager.translation("feature.dream.item.sun_fish.name"), DreamRarity.RARE, - Material.COOKED_SALMON, + Material.PAPER, true )); } diff --git a/src/main/java/fr/openmc/core/features/dream/registries/items/loots/BurnCoal.java b/src/main/java/fr/openmc/core/features/dream/registries/items/loots/BurnCoal.java index eeb1a8714..c85cd16d4 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/items/loots/BurnCoal.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/items/loots/BurnCoal.java @@ -13,7 +13,7 @@ public BurnCoal() { "omc_dream:coal_burn", TranslationManager.translation("feature.dream.item.coal_burn.name"), DreamRarity.EPIC, - Material.CHARCOAL, + Material.PAPER, false )); } diff --git a/src/main/java/fr/openmc/core/features/dream/registries/items/loots/CorruptedString.java b/src/main/java/fr/openmc/core/features/dream/registries/items/loots/CorruptedString.java index a0340556e..f7b5680b6 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/items/loots/CorruptedString.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/items/loots/CorruptedString.java @@ -13,7 +13,7 @@ public CorruptedString() { "omc_dream:corrupted_string", TranslationManager.translation("feature.dream.item.corrupted_string.name"), DreamRarity.COMMON, - Material.STRING, + Material.PAPER, false )); } diff --git a/src/main/java/fr/openmc/core/features/dream/registries/items/orb/CloudOrb.java b/src/main/java/fr/openmc/core/features/dream/registries/items/orb/CloudOrb.java index f8b3844e6..26f8618e5 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/items/orb/CloudOrb.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/items/orb/CloudOrb.java @@ -13,7 +13,7 @@ public CloudOrb() { "omc_dream:cloud_orb", TranslationManager.translation("feature.dream.item.cloud_orb.name"), DreamRarity.ONIRISIME, - Material.HEART_OF_THE_SEA, + Material.PAPER, true )); } diff --git a/src/main/java/fr/openmc/core/features/dream/registries/items/orb/DominationOrb.java b/src/main/java/fr/openmc/core/features/dream/registries/items/orb/DominationOrb.java index a1e487778..21dc234e6 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/items/orb/DominationOrb.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/items/orb/DominationOrb.java @@ -13,7 +13,7 @@ public DominationOrb() { "omc_dream:domination_orb", TranslationManager.translation("feature.dream.item.domination_orb.name"), DreamRarity.ONIRISIME, - Material.HEART_OF_THE_SEA, + Material.PAPER, true )); } diff --git a/src/main/java/fr/openmc/core/features/dream/registries/items/orb/GlaciteOrb.java b/src/main/java/fr/openmc/core/features/dream/registries/items/orb/GlaciteOrb.java index 1c7cdff5a..bc7fa37dc 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/items/orb/GlaciteOrb.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/items/orb/GlaciteOrb.java @@ -13,7 +13,7 @@ public GlaciteOrb() { "omc_dream:glacite_orb", TranslationManager.translation("feature.dream.item.glacite_orb.name"), DreamRarity.ONIRISIME, - Material.HEART_OF_THE_SEA, + Material.PAPER, true )); } diff --git a/src/main/java/fr/openmc/core/features/dream/registries/items/orb/MudOrb.java b/src/main/java/fr/openmc/core/features/dream/registries/items/orb/MudOrb.java index a43cdf5eb..d312f9870 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/items/orb/MudOrb.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/items/orb/MudOrb.java @@ -13,7 +13,7 @@ public MudOrb() { "omc_dream:mud_orb", TranslationManager.translation("feature.dream.item.mud_orb.name"), DreamRarity.ONIRISIME, - Material.HEART_OF_THE_SEA, + Material.PAPER, true )); } diff --git a/src/main/java/fr/openmc/core/features/dream/registries/items/orb/Singularity.java b/src/main/java/fr/openmc/core/features/dream/registries/items/orb/Singularity.java index de740c45a..4fac11440 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/items/orb/Singularity.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/items/orb/Singularity.java @@ -17,7 +17,7 @@ public Singularity() { "omc_dream:singularity", TranslationManager.translation("feature.dream.item.singularity.name"), DreamRarity.ONIRISIME, - Material.HEART_OF_THE_SEA, + Material.PAPER, false )); } diff --git a/src/main/java/fr/openmc/core/features/dream/registries/items/orb/SoulOrb.java b/src/main/java/fr/openmc/core/features/dream/registries/items/orb/SoulOrb.java index 78c80db6f..575f50295 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/items/orb/SoulOrb.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/items/orb/SoulOrb.java @@ -13,7 +13,7 @@ public SoulOrb() { "omc_dream:ame_orb", TranslationManager.translation("feature.dream.item.ame_orb.name"), DreamRarity.ONIRISIME, - Material.HEART_OF_THE_SEA, + Material.PAPER, true )); } diff --git a/src/main/java/fr/openmc/core/features/dream/registries/items/tools/MetalDetector.java b/src/main/java/fr/openmc/core/features/dream/registries/items/tools/MetalDetector.java index 470d8ec72..12936a938 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/items/tools/MetalDetector.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/items/tools/MetalDetector.java @@ -38,7 +38,7 @@ public MetalDetector() { "omc_dream:metal_detector", TranslationManager.translation("feature.dream.item.metal_detector.name"), DreamRarity.EPIC, - Material.STICK, + Material.PAPER, false )); } diff --git a/src/main/java/fr/openmc/core/features/dream/registries/items/tools/MeteoWand.java b/src/main/java/fr/openmc/core/features/dream/registries/items/tools/MeteoWand.java index 93e4af6a1..b323e2bb3 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/items/tools/MeteoWand.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/items/tools/MeteoWand.java @@ -29,7 +29,7 @@ public MeteoWand() { "omc_dream:meteo_wand", TranslationManager.translation("feature.dream.item.meteo_wand.name"), DreamRarity.LEGENDARY, - Material.STICK, + Material.PAPER, true )); } diff --git a/src/main/java/fr/openmc/core/features/dream/registries/items/tools/OldCreakingAxe.java b/src/main/java/fr/openmc/core/features/dream/registries/items/tools/OldCreakingAxe.java index d8df61922..d6ef18bd2 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/items/tools/OldCreakingAxe.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/items/tools/OldCreakingAxe.java @@ -13,7 +13,7 @@ public OldCreakingAxe() { "omc_dream:old_creaking_axe", TranslationManager.translation("feature.dream.item.old_creaking_axe.name"), DreamRarity.COMMON, - Material.STONE_AXE, + Material.PAPER, true )); } diff --git a/src/main/java/fr/openmc/core/features/dream/registries/items/tools/SoulAxe.java b/src/main/java/fr/openmc/core/features/dream/registries/items/tools/SoulAxe.java index e8fe6d106..d32644b22 100644 --- a/src/main/java/fr/openmc/core/features/dream/registries/items/tools/SoulAxe.java +++ b/src/main/java/fr/openmc/core/features/dream/registries/items/tools/SoulAxe.java @@ -13,7 +13,7 @@ public SoulAxe() { "omc_dream:soul_axe", TranslationManager.translation("feature.dream.item.soul_axe.name"), DreamRarity.RARE, - Material.IRON_AXE, + Material.PAPER, true )); } diff --git a/src/main/resources/contents/omc_contest/configs/shell.yml b/src/main/resources/contents/omc_contest/configs/shell.yml index d81e3d8d5..ca11ed6c2 100644 --- a/src/main/resources/contents/omc_contest/configs/shell.yml +++ b/src/main/resources/contents/omc_contest/configs/shell.yml @@ -4,7 +4,7 @@ items: contest_shell: display_name: resource: - material: NAUTILUS_SHELL + material: PAPER model_path: items/shell lore: - diff --git a/src/main/resources/contents/omc_daily_events/items.yml b/src/main/resources/contents/omc_daily_events/items.yml index ea410d96d..8bd96d2aa 100644 --- a/src/main/resources/contents/omc_daily_events/items.yml +++ b/src/main/resources/contents/omc_daily_events/items.yml @@ -8,7 +8,10 @@ items: generate: true textures: - other/tenders - material: COOKED_CHICKEN + material: PAPER + consumable: + nutrition: 8 + saturation: 1.4 lore: - @@ -25,13 +28,16 @@ items: kebab_fermented: display_name: resource: - material: COOKED_BEEF + material: PAPER generate: true textures: - "omc_foods:items/kebab" lore: - glint: true + consumable: + nutrition: 15 + saturation: 8 attribute_modifiers: mainhand: luck: 1.1 @@ -42,7 +48,7 @@ items: generate: true textures: - other/fermentum - material: STICK + material: PAPER lore: - - @@ -53,7 +59,7 @@ items: generate: true textures: - other/blessed_bread - material: STICK + material: PAPER enchants: - minecraft:sharpness:10 lore: diff --git a/src/main/resources/contents/omc_foods/items.yml b/src/main/resources/contents/omc_foods/items.yml index 47cb7b6a5..293e3c62d 100644 --- a/src/main/resources/contents/omc_foods/items.yml +++ b/src/main/resources/contents/omc_foods/items.yml @@ -4,17 +4,23 @@ items: courgette: display_name: resource: - material: DRIED_KELP + material: PAPER generate: true textures: - items/courgette.png + consumable: + nutrition: 1.4 + saturation: 0.4 gratin_courgette: display_name: resource: - material: MELON_SLICE + material: PAPER generate: false model_path: gratin_courgette + consumable: + nutrition: 12 + saturation: 7.4 events: eat: feed: @@ -24,26 +30,35 @@ items: onion: display_name: resource: - material: PORKCHOP + material: PAPER generate: true textures: - items/onion.png + consumable: + nutrition: 1 + saturation: 0.6 salade: display_name: resource: - material: DRIED_KELP + material: PAPER generate: true textures: - items/salade.png + consumable: + nutrition: 1.1 + saturation: 0.2 tomate: display_name: resource: - material: BEETROOT + material: PAPER generate: true textures: - items/tomate.png + consumable: + nutrition: 1.5 + saturation: 0.2 the_mixture: display_name: @@ -85,18 +100,24 @@ items: display_name: permission: ayw.frite resource: - material: GOLDEN_CARROT + material: PAPER generate: true textures: - items/frite.png + consumable: + nutrition: 3 + saturation: 0.7 kebab: display_name: resource: - material: COOKED_BEEF + material: PAPER generate: true textures: - items/kebab.png + consumable: + nutrition: 8 + saturation: 8 spatule: display_name: diff --git a/src/main/resources/contents/omc_icons/configs/fonts.yml b/src/main/resources/contents/omc_icons/configs/fonts.yml index 7129ed883..d72d0d785 100644 --- a/src/main/resources/contents/omc_icons/configs/fonts.yml +++ b/src/main/resources/contents/omc_icons/configs/fonts.yml @@ -1,12 +1,6 @@ info: namespace: omc_icons font_images: - openmc-armor-icon: - permission: openmc-armor-icon - show_in_gui: false - path: "openmc-armor-icon.png" - scale_ratio: 12 - y_position: 10 openmc: permission: server-icon show_in_gui: false diff --git a/src/main/resources/contents/omc_icons/configs/items.yml b/src/main/resources/contents/omc_icons/configs/items.yml deleted file mode 100644 index 8cafb5b35..000000000 --- a/src/main/resources/contents/omc_icons/configs/items.yml +++ /dev/null @@ -1,10 +0,0 @@ -info: - namespace: omc_icons -items: - openmc-armor-icon: - display_name: - resource: - material: PAPER - generate: true - textures: - - openmc-armor-icon \ No newline at end of file diff --git a/src/main/resources/contents/omc_icons/textures/openmc-armor-icon.png b/src/main/resources/contents/omc_icons/textures/openmc-armor-icon.png deleted file mode 100644 index ba8035dba..000000000 Binary files a/src/main/resources/contents/omc_icons/textures/openmc-armor-icon.png and /dev/null differ diff --git a/src/main/resources/contents/omc_items/items.yml b/src/main/resources/contents/omc_items/items.yml index 0cb7e2319..8b789d7a3 100644 --- a/src/main/resources/contents/omc_items/items.yml +++ b/src/main/resources/contents/omc_items/items.yml @@ -7,23 +7,23 @@ items: - resource: generate: true - material: EMERALD + material: PAPER textures: - aywenite.png mascot_stick: display_name: resource: - material: STICK + material: PAPER model_path: items/msctt_wand warp_stick: display_name: resource: - material: STICK + material: PAPER model_path: items/warp_wand unknown_stick: display_name: resource: - material: STICK + material: PAPER model_path: items/rndm_wand renforced_stick: display_name: