From 79f304521b786b726aa46ad2a271e61274c9f94b Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 2 Oct 2023 21:04:02 -0400 Subject: [PATCH] added loot tables and correct tools to break blocks --- .../util_rings/init/BlockInit.java | 12 ++++++++++- .../util_rings/blockstates/pine_log.json | 1 + .../minecraft/tags/blocks/mineable/axe.json | 6 ++++++ .../tags/blocks/mineable/pickaxe.json | 7 +++++++ .../tags/blocks/needs_iron_tool.json | 7 +++++++ .../tags/blocks/needs_stone_tool.json | 6 ++++++ .../loot_tables/blocks/lead_ore.json | 20 +++++++++++++++++++ .../loot_tables/blocks/pine_log.json | 20 +++++++++++++++++++ .../loot_tables/blocks/tin_ore.json | 20 +++++++++++++++++++ 9 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/data/minecraft/tags/blocks/mineable/axe.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json create mode 100644 src/main/resources/data/util_rings/loot_tables/blocks/lead_ore.json create mode 100644 src/main/resources/data/util_rings/loot_tables/blocks/pine_log.json create mode 100644 src/main/resources/data/util_rings/loot_tables/blocks/tin_ore.json diff --git a/src/main/java/com/skdevstudios/util_rings/init/BlockInit.java b/src/main/java/com/skdevstudios/util_rings/init/BlockInit.java index ccb73ea..8f3ee4d 100644 --- a/src/main/java/com/skdevstudios/util_rings/init/BlockInit.java +++ b/src/main/java/com/skdevstudios/util_rings/init/BlockInit.java @@ -4,7 +4,9 @@ import com.skdevstudios.util_rings.UtilRings; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.material.MapColor; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; @@ -14,5 +16,13 @@ public class BlockInit { public static final RegistryObject LEAD_ORE = BLOCKS.register("lead_ore", () -> new Block(BlockBehaviour.Properties.copy(Blocks.IRON_ORE))); public static final RegistryObject TIN_ORE = BLOCKS.register("tin_ore", () -> new Block(BlockBehaviour.Properties.copy(Blocks.IRON_ORE))); - public static final RegistryObject PINE_LOG = BLOCKS.register("pine_log", () -> new Block(BlockBehaviour.Properties.copy(Blocks.STONE))); + public static final RegistryObject PINE_LOG = BLOCKS.register("pine_log", + () -> new Block(BlockBehaviour.Properties.of() + .mapColor(MapColor.COLOR_BROWN) + .sound(SoundType.WOOD) + .strength(2) + .explosionResistance(2) + .requiresCorrectToolForDrops() + ) + ); } diff --git a/src/main/resources/assets/util_rings/blockstates/pine_log.json b/src/main/resources/assets/util_rings/blockstates/pine_log.json index df3d9bb..2284045 100644 --- a/src/main/resources/assets/util_rings/blockstates/pine_log.json +++ b/src/main/resources/assets/util_rings/blockstates/pine_log.json @@ -5,3 +5,4 @@ } } } + diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json new file mode 100644 index 0000000..dddda7a --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "util_rings:pine_log" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json new file mode 100644 index 0000000..59361d1 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "util_rings:lead_ore", + "util_rings:tin_ore" + ] +} \ No newline at end of file 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 0000000..59361d1 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "util_rings:lead_ore", + "util_rings:tin_ore" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json new file mode 100644 index 0000000..dddda7a --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "util_rings:pine_log" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/util_rings/loot_tables/blocks/lead_ore.json b/src/main/resources/data/util_rings/loot_tables/blocks/lead_ore.json new file mode 100644 index 0000000..1134180 --- /dev/null +++ b/src/main/resources/data/util_rings/loot_tables/blocks/lead_ore.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "util_rings:lead_ore" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/util_rings/loot_tables/blocks/pine_log.json b/src/main/resources/data/util_rings/loot_tables/blocks/pine_log.json new file mode 100644 index 0000000..98b41ff --- /dev/null +++ b/src/main/resources/data/util_rings/loot_tables/blocks/pine_log.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "util_rings:pine_log" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/util_rings/loot_tables/blocks/tin_ore.json b/src/main/resources/data/util_rings/loot_tables/blocks/tin_ore.json new file mode 100644 index 0000000..15b1bcc --- /dev/null +++ b/src/main/resources/data/util_rings/loot_tables/blocks/tin_ore.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "util_rings:tin_ore" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file