From 542b66c79a9b08e080c39c9a73d74ffe71c0106a Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Wed, 6 Jan 2021 17:27:52 +0000 Subject: [PATCH] Add back command computer block drops This has been broken for almost a year (28th Jan 2020), and I never noticed. Good job me. Fixes #641, closes #648 (basically the same, but targetting 1.15.x) --- .../loot_tables/blocks/computer_command.json | 34 +++++++++++++++++++ .../dan200/computercraft/data/LootTables.java | 1 + 2 files changed, 35 insertions(+) create mode 100644 src/generated/resources/data/computercraft/loot_tables/blocks/computer_command.json diff --git a/src/generated/resources/data/computercraft/loot_tables/blocks/computer_command.json b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_command.json new file mode 100644 index 000000000..6ca0e4761 --- /dev/null +++ b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_command.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "minecraft:dynamic", + "name": "computercraft:computer" + } + ], + "conditions": [ + { + "condition": "minecraft:alternative", + "terms": [ + { + "condition": "computercraft:block_named" + }, + { + "condition": "computercraft:has_id" + }, + { + "condition": "minecraft:inverted", + "term": { + "condition": "computercraft:player_creative" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/java/dan200/computercraft/data/LootTables.java b/src/main/java/dan200/computercraft/data/LootTables.java index 946d57fac..df7d1c8ed 100644 --- a/src/main/java/dan200/computercraft/data/LootTables.java +++ b/src/main/java/dan200/computercraft/data/LootTables.java @@ -42,6 +42,7 @@ protected void registerLoot( BiConsumer add ) computerDrop( add, Registry.ModBlocks.COMPUTER_NORMAL ); computerDrop( add, Registry.ModBlocks.COMPUTER_ADVANCED ); + computerDrop( add, Registry.ModBlocks.COMPUTER_COMMAND ); computerDrop( add, Registry.ModBlocks.TURTLE_NORMAL ); computerDrop( add, Registry.ModBlocks.TURTLE_ADVANCED );