From 3887ea1da7fbbde65a84947b589d3d4707b81195 Mon Sep 17 00:00:00 2001 From: Mads Risager Date: Mon, 15 May 2023 10:37:39 +0200 Subject: [PATCH 1/4] Add harvest tool --- .../resources/data/loot_tables/blocks/turtle_block.json | 0 .../data/minecraft/tags/blocks/mineable/pickaxe.json | 6 ++++++ .../data/minecraft/tags/blocks/needs_stone_tool.json | 6 ++++++ .../data/minescript/tags/blocks/mineable/pickaxe.json | 0 .../resources/data/minescript/tags/blocks/turtle_block.json | 0 5 files changed, 12 insertions(+) create mode 100644 src/main/resources/data/loot_tables/blocks/turtle_block.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_stone_tool.json create mode 100644 src/main/resources/data/minescript/tags/blocks/mineable/pickaxe.json create mode 100644 src/main/resources/data/minescript/tags/blocks/turtle_block.json diff --git a/src/main/resources/data/loot_tables/blocks/turtle_block.json b/src/main/resources/data/loot_tables/blocks/turtle_block.json new file mode 100644 index 0000000..e69de29 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..e477bb1 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minescript:turtle_block" + ] +} \ 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..e477bb1 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minescript:turtle_block" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minescript/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minescript/tags/blocks/mineable/pickaxe.json new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/data/minescript/tags/blocks/turtle_block.json b/src/main/resources/data/minescript/tags/blocks/turtle_block.json new file mode 100644 index 0000000..e69de29 From 52d178a1228d1ad185bada8b3b10e794804c89e7 Mon Sep 17 00:00:00 2001 From: Mads Risager Date: Mon, 15 May 2023 10:38:12 +0200 Subject: [PATCH 2/4] Add block drop --- .../loot_tables/blocks/turtle_block.json | 19 +++++++++++++++++++ .../tags/blocks/mineable/pickaxe.json | 0 .../minescript/tags/blocks/turtle_block.json | 0 3 files changed, 19 insertions(+) create mode 100644 src/main/resources/data/minescript/loot_tables/blocks/turtle_block.json delete mode 100644 src/main/resources/data/minescript/tags/blocks/mineable/pickaxe.json delete mode 100644 src/main/resources/data/minescript/tags/blocks/turtle_block.json diff --git a/src/main/resources/data/minescript/loot_tables/blocks/turtle_block.json b/src/main/resources/data/minescript/loot_tables/blocks/turtle_block.json new file mode 100644 index 0000000..a2c5665 --- /dev/null +++ b/src/main/resources/data/minescript/loot_tables/blocks/turtle_block.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minescript:turtle_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minescript/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minescript/tags/blocks/mineable/pickaxe.json deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/resources/data/minescript/tags/blocks/turtle_block.json b/src/main/resources/data/minescript/tags/blocks/turtle_block.json deleted file mode 100644 index e69de29..0000000 From 0f0a7485e29191cbd19046b8a6a7e1f5d8b96d4c Mon Sep 17 00:00:00 2001 From: Mads Risager Date: Mon, 15 May 2023 10:39:23 +0200 Subject: [PATCH 3/4] Fix block settings --- src/main/java/minescript/block/ModBlocks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/minescript/block/ModBlocks.java b/src/main/java/minescript/block/ModBlocks.java index b9775e6..be21cbd 100644 --- a/src/main/java/minescript/block/ModBlocks.java +++ b/src/main/java/minescript/block/ModBlocks.java @@ -14,7 +14,7 @@ import net.minecraft.util.Identifier; public class ModBlocks { - public static final Block TURTLE_BLOCK = registerBlock("turtle_block", new TurtleBlock(FabricBlockSettings.copyOf(Blocks.MANGROVE_WOOD))); + public static final Block TURTLE_BLOCK = registerBlock("turtle_block", new TurtleBlock(FabricBlockSettings.copyOf(Blocks.IRON_BLOCK).strength(5.0f).requiresTool())); private static Block registerBlockWithoutBlockItem(String name, Block block){ return Registry.register(Registries.BLOCK, new Identifier(MineScript.MOD_ID, name), block); From 816475bf596b10f669262e0c71758932594bedcf Mon Sep 17 00:00:00 2001 From: Mads Risager Date: Mon, 15 May 2023 10:42:44 +0200 Subject: [PATCH 4/4] Option to break block --- src/main/java/minescript/network/TurtleCommands.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/minescript/network/TurtleCommands.java b/src/main/java/minescript/network/TurtleCommands.java index 0fe72ed..425bdae 100644 --- a/src/main/java/minescript/network/TurtleCommands.java +++ b/src/main/java/minescript/network/TurtleCommands.java @@ -43,6 +43,7 @@ public static CompletableFuture step(MinecraftServer server, ServerWor } } + // world.breakBlock(entity.turtlePos, true); world.setBlockState(entity.turtlePos, state, Block.NOTIFY_ALL); world.setBlockState(oldPos, placingBlock.getDefaultState(), Block.NOTIFY_ALL);