diff --git a/src/main/java/fr/openmc/core/registry/items/contents/Hammer.java b/src/main/java/fr/openmc/core/registry/items/contents/Hammer.java index e98eb98f3..21a879302 100644 --- a/src/main/java/fr/openmc/core/registry/items/contents/Hammer.java +++ b/src/main/java/fr/openmc/core/registry/items/contents/Hammer.java @@ -91,7 +91,9 @@ private boolean breakBlock(World world, Player player, int x, int y, int z, Mate CustomBlock customBlock = CustomBlock.byAlreadyPlaced(block); if (customBlock != null) { - customBlock.drop(block.getLocation()); + customBlock.getLoot(player.getInventory().getItemInMainHand(), false).forEach( + item -> world.dropItemNaturally(block.getLocation(), item) + ); return customBlock.remove(); } diff --git a/src/main/resources/contents/omc_blocks/blocks.yml b/src/main/resources/contents/omc_blocks/blocks.yml index ac926038e..5a9bd5112 100644 --- a/src/main/resources/contents/omc_blocks/blocks.yml +++ b/src/main/resources/contents/omc_blocks/blocks.yml @@ -34,18 +34,6 @@ items: name: BLOCK_STONE_PLACE volume: 1 pitch: 1 - events: - placed_block: - break: - drop_item: - item: omc_items:aywenite - min_amount: 1 - max_amount: 2 - chance: 100 - drop_exp: - chance: 100 - min_amount: 1 - max_amount: 3 deepslate_aywenite_ore: display_name: lore: @@ -80,18 +68,6 @@ items: name: BLOCK_STONE_PLACE volume: 1 pitch: 1 - events: - placed_block: - break: - drop_item: - item: omc_items:aywenite - min_amount: 1 - max_amount: 2 - chance: 100 - drop_exp: - chance: 100 - min_amount: 1 - max_amount: 3 aywenite_block: display_name: lore: diff --git a/src/main/resources/contents/omc_blocks/loots.yml b/src/main/resources/contents/omc_blocks/loots.yml new file mode 100644 index 000000000..8ccb639dc --- /dev/null +++ b/src/main/resources/contents/omc_blocks/loots.yml @@ -0,0 +1,30 @@ +info: + namespace: omc_blocks +loots: + blocks: + aywenite_ore: + type: omc_blocks:aywenite_ore + items: + ruby: + item: omc_items:aywenite + min_amount: 1 + max_amount: 2 + chance: 100 + exp: + exp_1: + chance: 100 + min_amount: 1 + max_amount: 3 + deepslate_aywenite_ore: + type: omc_blocks:deepslate_aywenite_ore + items: + ruby: + item: omc_items:aywenite + min_amount: 1 + max_amount: 2 + chance: 100 + exp: + exp_1: + chance: 100 + min_amount: 1 + max_amount: 3 \ No newline at end of file diff --git a/src/main/resources/contents/omc_dream/blocks.yml b/src/main/resources/contents/omc_dream/blocks.yml index 6e0f7a9d5..13ef2f115 100644 --- a/src/main/resources/contents/omc_dream/blocks.yml +++ b/src/main/resources/contents/omc_dream/blocks.yml @@ -47,18 +47,6 @@ items: name: BLOCK_STONE_PLACE volume: 1 pitch: 1 - events: - placed_block: - break: - drop_item: - item: omc_dream:ewenite - min_amount: 1 - max_amount: 2 - chance: 100 - drop_exp: - chance: 0 - min_amount: 1 - max_amount: 3 deepslate_ewenite_ore: display_name: lore: @@ -91,18 +79,6 @@ items: name: BLOCK_STONE_PLACE volume: 1 pitch: 1 - events: - placed_block: - break: - drop_item: - item: omc_dream:ewenite - min_amount: 1 - max_amount: 2 - chance: 100 - drop_exp: - chance: 0 - min_amount: 1 - max_amount: 3 ewenite_block: display_name: lore: diff --git a/src/main/resources/contents/omc_dream/loots.yml b/src/main/resources/contents/omc_dream/loots.yml new file mode 100644 index 000000000..b5d64921f --- /dev/null +++ b/src/main/resources/contents/omc_dream/loots.yml @@ -0,0 +1,30 @@ +info: + namespace: omc_dream +loots: + blocks: + ewenite_ore: + type: omc_dream:ewenite_ore + items: + ruby: + item: omc_dream:ewenite + min_amount: 1 + max_amount: 2 + chance: 100 + exp: + exp_1: + chance: 0 + min_amount: 1 + max_amount: 3 + deepslate_ewenite_ore: + type: omc_dream:deepslate_ewenite_ore + items: + ruby: + item: omc_dream:ewenite + min_amount: 1 + max_amount: 2 + chance: 100 + exp: + exp_1: + chance: 0 + min_amount: 1 + max_amount: 3 \ No newline at end of file