diff --git a/src/main/java/net/mcreator/target/block/DeepslateGalenaOreBlock.java b/src/main/java/net/mcreator/target/block/DeepslateGalenaOreBlock.java index d7e3de0c4..683fe52c1 100644 --- a/src/main/java/net/mcreator/target/block/DeepslateGalenaOreBlock.java +++ b/src/main/java/net/mcreator/target/block/DeepslateGalenaOreBlock.java @@ -1,39 +1,12 @@ package net.mcreator.target.block; -import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.PickaxeItem; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.NoteBlockInstrument; -import java.util.List; - public class DeepslateGalenaOreBlock extends Block { public DeepslateGalenaOreBlock() { super(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASEDRUM).sound(SoundType.STONE).strength(3f, 8f).requiresCorrectToolForDrops()); } - - @Override - public void appendHoverText(ItemStack itemstack, BlockGetter world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } - - @Override - public int getLightBlock(BlockState state, BlockGetter worldIn, BlockPos pos) { - return 15; - } - - @Override - public boolean canHarvestBlock(BlockState state, BlockGetter world, BlockPos pos, Player player) { - if (player.getInventory().getSelected().getItem() instanceof PickaxeItem tieredItem) - return tieredItem.getTier().getLevel() >= 2; - return false; - } } diff --git a/src/main/java/net/mcreator/target/block/DeepslateScheeliteOreBlock.java b/src/main/java/net/mcreator/target/block/DeepslateScheeliteOreBlock.java index ff97cbe2a..f01b5386e 100644 --- a/src/main/java/net/mcreator/target/block/DeepslateScheeliteOreBlock.java +++ b/src/main/java/net/mcreator/target/block/DeepslateScheeliteOreBlock.java @@ -1,39 +1,12 @@ package net.mcreator.target.block; -import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.PickaxeItem; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.NoteBlockInstrument; -import java.util.List; - public class DeepslateScheeliteOreBlock extends Block { public DeepslateScheeliteOreBlock() { super(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASEDRUM).sound(SoundType.STONE).strength(3f, 8f).requiresCorrectToolForDrops()); } - - @Override - public void appendHoverText(ItemStack itemstack, BlockGetter world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } - - @Override - public int getLightBlock(BlockState state, BlockGetter worldIn, BlockPos pos) { - return 15; - } - - @Override - public boolean canHarvestBlock(BlockState state, BlockGetter world, BlockPos pos, Player player) { - if (player.getInventory().getSelected().getItem() instanceof PickaxeItem tieredItem) - return tieredItem.getTier().getLevel() >= 2; - return false; - } } diff --git a/src/main/java/net/mcreator/target/block/GalenaOreBlock.java b/src/main/java/net/mcreator/target/block/GalenaOreBlock.java index ab15ed4f3..24d07d736 100644 --- a/src/main/java/net/mcreator/target/block/GalenaOreBlock.java +++ b/src/main/java/net/mcreator/target/block/GalenaOreBlock.java @@ -1,39 +1,12 @@ package net.mcreator.target.block; -import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.PickaxeItem; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.NoteBlockInstrument; -import java.util.List; - public class GalenaOreBlock extends Block { public GalenaOreBlock() { super(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASEDRUM).sound(SoundType.STONE).strength(3f, 5f).requiresCorrectToolForDrops()); } - - @Override - public void appendHoverText(ItemStack itemstack, BlockGetter world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } - - @Override - public int getLightBlock(BlockState state, BlockGetter worldIn, BlockPos pos) { - return 15; - } - - @Override - public boolean canHarvestBlock(BlockState state, BlockGetter world, BlockPos pos, Player player) { - if (player.getInventory().getSelected().getItem() instanceof PickaxeItem tieredItem) - return tieredItem.getTier().getLevel() >= 2; - return false; - } } diff --git a/src/main/java/net/mcreator/target/block/ScheeliteOreBlock.java b/src/main/java/net/mcreator/target/block/ScheeliteOreBlock.java index d61d14e71..dfbb8498c 100644 --- a/src/main/java/net/mcreator/target/block/ScheeliteOreBlock.java +++ b/src/main/java/net/mcreator/target/block/ScheeliteOreBlock.java @@ -1,39 +1,12 @@ package net.mcreator.target.block; -import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.PickaxeItem; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.NoteBlockInstrument; -import java.util.List; - public class ScheeliteOreBlock extends Block { public ScheeliteOreBlock() { super(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASEDRUM).sound(SoundType.STONE).strength(3f, 5f).requiresCorrectToolForDrops()); } - - @Override - public void appendHoverText(ItemStack itemstack, BlockGetter world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } - - @Override - public int getLightBlock(BlockState state, BlockGetter worldIn, BlockPos pos) { - return 15; - } - - @Override - public boolean canHarvestBlock(BlockState state, BlockGetter world, BlockPos pos, Player player) { - if (player.getInventory().getSelected().getItem() instanceof PickaxeItem tieredItem) - return tieredItem.getTier().getLevel() >= 2; - return false; - } } diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json new file mode 100644 index 000000000..f34f3b328 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "target:galena_ore", + "target:deepslate_galena_ore", + "target:scheelite_ore", + "target:deepslate_scheelite_ore" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/target/loot_tables/blocks/deepslate_galena_ore.json b/src/main/resources/data/target/loot_tables/blocks/deepslate_galena_ore.json index 7e39f8604..d779dbe14 100644 --- a/src/main/resources/data/target/loot_tables/blocks/deepslate_galena_ore.json +++ b/src/main/resources/data/target/loot_tables/blocks/deepslate_galena_ore.json @@ -1 +1,50 @@ -{"type":"minecraft:block","pools":[{"bonus_rolls":0.0,"entries":[{"type":"minecraft:alternatives","children":[{"type":"minecraft:item","conditions":[{"condition":"minecraft:match_tool","predicate":{"enchantments":[{"enchantment":"minecraft:silk_touch","levels":{"min":1}}]}}],"name":"target:galena"},{"type":"minecraft:item","functions":[{"enchantment":"minecraft:fortune","formula":"minecraft:ore_drops","function":"minecraft:apply_bonus"},{"function":"minecraft:explosion_decay"}],"name":"target:galena"}]}],"rolls":1.0}],"random_sequence":"target:blocks/deepslate_galena_ore"} \ No newline at end of file +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "target:deepslate_galena_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "target:galena" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "target:blocks/deepslate_galena_ore" +} \ No newline at end of file diff --git a/src/main/resources/data/target/loot_tables/blocks/deepslate_scheelite_ore.json b/src/main/resources/data/target/loot_tables/blocks/deepslate_scheelite_ore.json index f80e61d46..7d9225ddc 100644 --- a/src/main/resources/data/target/loot_tables/blocks/deepslate_scheelite_ore.json +++ b/src/main/resources/data/target/loot_tables/blocks/deepslate_scheelite_ore.json @@ -1 +1,50 @@ -{"type":"minecraft:block","pools":[{"bonus_rolls":0.0,"entries":[{"type":"minecraft:alternatives","children":[{"type":"minecraft:item","conditions":[{"condition":"minecraft:match_tool","predicate":{"enchantments":[{"enchantment":"minecraft:silk_touch","levels":{"min":1}}]}}],"name":"target:scheelite"},{"type":"minecraft:item","functions":[{"enchantment":"minecraft:fortune","formula":"minecraft:ore_drops","function":"minecraft:apply_bonus"},{"function":"minecraft:explosion_decay"}],"name":"target:scheelite"}]}],"rolls":1.0}],"random_sequence":"target:blocks/deepslate_scheelite_ore"} \ No newline at end of file +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "target:deepslate_scheelite_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "target:scheelite" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "target:blocks/deepslate_scheelite_ore" +} \ No newline at end of file diff --git a/src/main/resources/data/target/loot_tables/blocks/galena_ore.json b/src/main/resources/data/target/loot_tables/blocks/galena_ore.json index d3b1d799d..c49256b7a 100644 --- a/src/main/resources/data/target/loot_tables/blocks/galena_ore.json +++ b/src/main/resources/data/target/loot_tables/blocks/galena_ore.json @@ -1 +1,50 @@ -{"type":"minecraft:block","pools":[{"bonus_rolls":0.0,"entries":[{"type":"minecraft:alternatives","children":[{"type":"minecraft:item","conditions":[{"condition":"minecraft:match_tool","predicate":{"enchantments":[{"enchantment":"minecraft:silk_touch","levels":{"min":1}}]}}],"name":"target:galena"},{"type":"minecraft:item","functions":[{"enchantment":"minecraft:fortune","formula":"minecraft:ore_drops","function":"minecraft:apply_bonus"},{"function":"minecraft:explosion_decay"}],"name":"target:galena"}]}],"rolls":1.0}],"random_sequence":"target:blocks/galena_ore"} \ No newline at end of file +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "target:galena_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "target:galena" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "target:blocks/galena_ore" +} \ No newline at end of file diff --git a/src/main/resources/data/target/loot_tables/blocks/scheelite_ore.json b/src/main/resources/data/target/loot_tables/blocks/scheelite_ore.json index 0eed57713..7d66c09af 100644 --- a/src/main/resources/data/target/loot_tables/blocks/scheelite_ore.json +++ b/src/main/resources/data/target/loot_tables/blocks/scheelite_ore.json @@ -1 +1,50 @@ -{"type":"minecraft:block","pools":[{"bonus_rolls":0.0,"entries":[{"type":"minecraft:alternatives","children":[{"type":"minecraft:item","conditions":[{"condition":"minecraft:match_tool","predicate":{"enchantments":[{"enchantment":"minecraft:silk_touch","levels":{"min":1}}]}}],"name":"target:scheelite"},{"type":"minecraft:item","functions":[{"enchantment":"minecraft:fortune","formula":"minecraft:ore_drops","function":"minecraft:apply_bonus"},{"function":"minecraft:explosion_decay"}],"name":"target:scheelite"}]}],"rolls":1.0}],"random_sequence":"target:blocks/scheelite_ore"} \ No newline at end of file +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "target:scheelite_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "target:scheelite" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "target:blocks/scheelite_ore" +} \ No newline at end of file diff --git a/src/main/resources/data/target/loot_tables/chests/target_epic_chest.json b/src/main/resources/data/target/loot_tables/chests/target_epic_chest.json deleted file mode 100644 index 90d0e30ac..000000000 --- a/src/main/resources/data/target/loot_tables/chests/target_epic_chest.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "type": "minecraft:chest", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:tag", - "name": "target:blueprint_epic", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ], - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.45 - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:tag", - "name": "target:blueprint_legendary", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ], - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.35 - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:tag", - "name": "target:blueprint_special", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ], - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.25 - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/target/loot_tables/chests/target_rare_chest.json b/src/main/resources/data/target/loot_tables/chests/target_rare_chest.json deleted file mode 100644 index 9d2faf56a..000000000 --- a/src/main/resources/data/target/loot_tables/chests/target_rare_chest.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "type": "minecraft:chest", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:tag", - "name": "target:blueprint_rare", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ], - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.35 - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:tag", - "name": "target:blueprint_epic", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ], - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.25 - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:tag", - "name": "target:blueprint_legendary", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ], - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.15 - } - ] - } - ] - } - ] -}