Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public DockerFish() {
"omc_dream:dockerfish",
TranslationManager.translation("feature.dream.item.dockerfish.name"),
DreamRarity.RARE,
Material.COD,
Material.PAPER,
true
));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public Poissonion() {
"omc_dream:poissonion",
TranslationManager.translation("feature.dream.item.poissonion.name"),
DreamRarity.RARE,
Material.COD,
Material.PAPER,
true
));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/contents/omc_contest/configs/shell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ items:
contest_shell:
display_name: <lang:itemsadder.omc_contest.contest_shell.name>
resource:
material: NAUTILUS_SHELL
material: PAPER
model_path: items/shell
lore:
- <lang:itemsadder.omc_contest.contest_shell.lore.0>
Expand Down
14 changes: 10 additions & 4 deletions src/main/resources/contents/omc_daily_events/items.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ items:
generate: true
textures:
- other/tenders
material: COOKED_CHICKEN
material: PAPER
consumable:
nutrition: 8
saturation: 1.4
lore:
- <lang:itemsadder.omc_daily_events.tenders.lore.0>

Expand All @@ -25,13 +28,16 @@ items:
kebab_fermented:
display_name: <lang:itemsadder.omc_daily_events.kebab_fermented.name>
resource:
material: COOKED_BEEF
material: PAPER
generate: true
textures:
- "omc_foods:items/kebab"
lore:
- <lang:itemsadder.omc_daily_events.kebab_fermented.lore.0>
glint: true
consumable:
nutrition: 15
saturation: 8
attribute_modifiers:
mainhand:
luck: 1.1
Expand All @@ -42,7 +48,7 @@ items:
generate: true
textures:
- other/fermentum
material: STICK
material: PAPER
lore:
- <lang:itemsadder.omc_daily_events.fermentum.lore.0>
- <lang:itemsadder.omc_daily_events.fermentum.lore.1>
Expand All @@ -53,7 +59,7 @@ items:
generate: true
textures:
- other/blessed_bread
material: STICK
material: PAPER
enchants:
- minecraft:sharpness:10
lore:
Expand Down
35 changes: 28 additions & 7 deletions src/main/resources/contents/omc_foods/items.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,23 @@ items:
courgette:
display_name: <lang:itemsadder.omc_foods.courgette.name>
resource:
material: DRIED_KELP
material: PAPER
generate: true
textures:
- items/courgette.png
consumable:
nutrition: 1.4
saturation: 0.4

gratin_courgette:
display_name: <lang:itemsadder.omc_foods.gratin_courgette.name>
resource:
material: MELON_SLICE
material: PAPER
generate: false
model_path: gratin_courgette
consumable:
nutrition: 12
saturation: 7.4
events:
eat:
feed:
Expand All @@ -24,26 +30,35 @@ items:
onion:
display_name: <lang:itemsadder.omc_foods.onion.name>
resource:
material: PORKCHOP
material: PAPER
generate: true
textures:
- items/onion.png
consumable:
nutrition: 1
saturation: 0.6

salade:
display_name: <lang:itemsadder.omc_foods.salade.name>
resource:
material: DRIED_KELP
material: PAPER
generate: true
textures:
- items/salade.png
consumable:
nutrition: 1.1
saturation: 0.2

tomate:
display_name: <lang:itemsadder.omc_foods.tomate.name>
resource:
material: BEETROOT
material: PAPER
generate: true
textures:
- items/tomate.png
consumable:
nutrition: 1.5
saturation: 0.2

the_mixture:
display_name: <lang:itemsadder.omc_foods.the_mixture.name>
Expand Down Expand Up @@ -85,18 +100,24 @@ items:
display_name: <lang:itemsadder.omc_foods.frite.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: <lang:itemsadder.omc_foods.kebab.name>
resource:
material: COOKED_BEEF
material: PAPER
generate: true
textures:
- items/kebab.png
consumable:
nutrition: 8
saturation: 8

spatule:
display_name: <lang:itemsadder.omc_foods.spatule.name>
Expand Down
6 changes: 0 additions & 6 deletions src/main/resources/contents/omc_icons/configs/fonts.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 0 additions & 10 deletions src/main/resources/contents/omc_icons/configs/items.yml

This file was deleted.

Binary file not shown.
8 changes: 4 additions & 4 deletions src/main/resources/contents/omc_items/items.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@ items:
- <lang:itemsadder.omc_items.aywenite.lore.0>
resource:
generate: true
material: EMERALD
material: PAPER
textures:
- aywenite.png
mascot_stick:
display_name: <lang:itemsadder.omc_items.mascot_stick.name>
resource:
material: STICK
material: PAPER
model_path: items/msctt_wand
warp_stick:
display_name: <lang:itemsadder.omc_items.warp_stick.name>
resource:
material: STICK
material: PAPER
model_path: items/warp_wand
unknown_stick:
display_name: <lang:itemsadder.omc_items.unknown_stick.name>
resource:
material: STICK
material: PAPER
model_path: items/rndm_wand
renforced_stick:
display_name: <lang:itemsadder.omc_items.renforced_stick.name>
Expand Down
Loading