From 08a0342618d37f2c042f2944b6616aca8acbc95d Mon Sep 17 00:00:00 2001
From: SquidDev <git@squiddev.cc>
Date: Fri, 24 Apr 2020 16:41:46 +0100
Subject: [PATCH] Fix block drop data being generated in the incorrect place

Fixes half of #421
---
 build.gradle                                                | 4 ++--
 .../loot_tables/{ => blocks}/computer_advanced.json         | 1 +
 .../loot_tables/{ => blocks}/computer_normal.json           | 1 +
 .../computercraft/loot_tables/{ => blocks}/disk_drive.json  | 1 +
 .../loot_tables/{ => blocks}/monitor_advanced.json          | 1 +
 .../loot_tables/{ => blocks}/monitor_normal.json            | 1 +
 .../computercraft/loot_tables/{ => blocks}/printer.json     | 1 +
 .../computercraft/loot_tables/{ => blocks}/speaker.json     | 1 +
 .../loot_tables/{ => blocks}/turtle_advanced.json           | 1 +
 .../loot_tables/{ => blocks}/turtle_normal.json             | 1 +
 .../loot_tables/{ => blocks}/wired_modem_full.json          | 1 +
 .../loot_tables/{ => blocks}/wireless_modem_advanced.json   | 1 +
 .../loot_tables/{ => blocks}/wireless_modem_normal.json     | 1 +
 src/main/java/dan200/computercraft/data/LootTables.java     | 6 ++++--
 14 files changed, 18 insertions(+), 4 deletions(-)
 rename src/generated/resources/data/computercraft/loot_tables/{ => blocks}/computer_advanced.json (95%)
 rename src/generated/resources/data/computercraft/loot_tables/{ => blocks}/computer_normal.json (95%)
 rename src/generated/resources/data/computercraft/loot_tables/{ => blocks}/disk_drive.json (91%)
 rename src/generated/resources/data/computercraft/loot_tables/{ => blocks}/monitor_advanced.json (91%)
 rename src/generated/resources/data/computercraft/loot_tables/{ => blocks}/monitor_normal.json (91%)
 rename src/generated/resources/data/computercraft/loot_tables/{ => blocks}/printer.json (91%)
 rename src/generated/resources/data/computercraft/loot_tables/{ => blocks}/speaker.json (91%)
 rename src/generated/resources/data/computercraft/loot_tables/{ => blocks}/turtle_advanced.json (95%)
 rename src/generated/resources/data/computercraft/loot_tables/{ => blocks}/turtle_normal.json (95%)
 rename src/generated/resources/data/computercraft/loot_tables/{ => blocks}/wired_modem_full.json (91%)
 rename src/generated/resources/data/computercraft/loot_tables/{ => blocks}/wireless_modem_advanced.json (91%)
 rename src/generated/resources/data/computercraft/loot_tables/{ => blocks}/wireless_modem_normal.json (91%)

diff --git a/build.gradle b/build.gradle
index 51b822545..159eedfbd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,7 +48,7 @@ minecraft {
 
         server {
             workingDirectory project.file('run')
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+            property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
             property 'forge.logging.console.level', 'debug'
 
             mods {
@@ -60,7 +60,7 @@ minecraft {
 
         data {
             workingDirectory project.file('run')
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+            property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
             property 'forge.logging.console.level', 'debug'
 
             args '--mod', 'computercraft', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
diff --git a/src/generated/resources/data/computercraft/loot_tables/computer_advanced.json b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_advanced.json
similarity index 95%
rename from src/generated/resources/data/computercraft/loot_tables/computer_advanced.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/computer_advanced.json
index 09dac48f6..74fb9c725 100644
--- a/src/generated/resources/data/computercraft/loot_tables/computer_advanced.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_advanced.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/computer_normal.json b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_normal.json
similarity index 95%
rename from src/generated/resources/data/computercraft/loot_tables/computer_normal.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/computer_normal.json
index 09dac48f6..74fb9c725 100644
--- a/src/generated/resources/data/computercraft/loot_tables/computer_normal.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_normal.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/disk_drive.json b/src/generated/resources/data/computercraft/loot_tables/blocks/disk_drive.json
similarity index 91%
rename from src/generated/resources/data/computercraft/loot_tables/disk_drive.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/disk_drive.json
index 675f3cf78..4bd0f0ea2 100644
--- a/src/generated/resources/data/computercraft/loot_tables/disk_drive.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/disk_drive.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/monitor_advanced.json b/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_advanced.json
similarity index 91%
rename from src/generated/resources/data/computercraft/loot_tables/monitor_advanced.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/monitor_advanced.json
index e5c1b82b1..21e4fc349 100644
--- a/src/generated/resources/data/computercraft/loot_tables/monitor_advanced.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_advanced.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/monitor_normal.json b/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_normal.json
similarity index 91%
rename from src/generated/resources/data/computercraft/loot_tables/monitor_normal.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/monitor_normal.json
index f27f7adcf..3e4d5df59 100644
--- a/src/generated/resources/data/computercraft/loot_tables/monitor_normal.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_normal.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/printer.json b/src/generated/resources/data/computercraft/loot_tables/blocks/printer.json
similarity index 91%
rename from src/generated/resources/data/computercraft/loot_tables/printer.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/printer.json
index c632c9d67..e401a994b 100644
--- a/src/generated/resources/data/computercraft/loot_tables/printer.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/printer.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/speaker.json b/src/generated/resources/data/computercraft/loot_tables/blocks/speaker.json
similarity index 91%
rename from src/generated/resources/data/computercraft/loot_tables/speaker.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/speaker.json
index 5b6d03f9a..90e5773e3 100644
--- a/src/generated/resources/data/computercraft/loot_tables/speaker.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/speaker.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/turtle_advanced.json b/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_advanced.json
similarity index 95%
rename from src/generated/resources/data/computercraft/loot_tables/turtle_advanced.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/turtle_advanced.json
index 09dac48f6..74fb9c725 100644
--- a/src/generated/resources/data/computercraft/loot_tables/turtle_advanced.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_advanced.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/turtle_normal.json b/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_normal.json
similarity index 95%
rename from src/generated/resources/data/computercraft/loot_tables/turtle_normal.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/turtle_normal.json
index 09dac48f6..74fb9c725 100644
--- a/src/generated/resources/data/computercraft/loot_tables/turtle_normal.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_normal.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/wired_modem_full.json b/src/generated/resources/data/computercraft/loot_tables/blocks/wired_modem_full.json
similarity index 91%
rename from src/generated/resources/data/computercraft/loot_tables/wired_modem_full.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/wired_modem_full.json
index 02bd68624..cb2b02189 100644
--- a/src/generated/resources/data/computercraft/loot_tables/wired_modem_full.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/wired_modem_full.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/wireless_modem_advanced.json b/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_advanced.json
similarity index 91%
rename from src/generated/resources/data/computercraft/loot_tables/wireless_modem_advanced.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_advanced.json
index 4f46d4b0f..03e30c572 100644
--- a/src/generated/resources/data/computercraft/loot_tables/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_advanced.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/wireless_modem_normal.json b/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_normal.json
similarity index 91%
rename from src/generated/resources/data/computercraft/loot_tables/wireless_modem_normal.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_normal.json
index a9fdb21e7..30c49f858 100644
--- a/src/generated/resources/data/computercraft/loot_tables/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_normal.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/main/java/dan200/computercraft/data/LootTables.java b/src/main/java/dan200/computercraft/data/LootTables.java
index f40295ccc..02db8551e 100644
--- a/src/main/java/dan200/computercraft/data/LootTables.java
+++ b/src/main/java/dan200/computercraft/data/LootTables.java
@@ -45,8 +45,9 @@ public class LootTables extends LootTableProvider
 
     private static void basicDrop( BiConsumer<ResourceLocation, LootTable> add, Block block )
     {
-        add.accept( block.getRegistryName(), LootTable
+        add.accept( block.getLootTable(), LootTable
             .builder()
+            .setParameterSet( LootParameterSets.BLOCK )
             .addLootPool( LootPool.builder()
                 .name( "main" )
                 .rolls( ConstantRange.of( 1 ) )
@@ -57,8 +58,9 @@ public class LootTables extends LootTableProvider
 
     private static void computerDrop( BiConsumer<ResourceLocation, LootTable> add, Block block )
     {
-        add.accept( block.getRegistryName(), LootTable
+        add.accept( block.getLootTable(), LootTable
             .builder()
+            .setParameterSet( LootParameterSets.BLOCK )
             .addLootPool( LootPool.builder()
                 .name( "main" )
                 .rolls( ConstantRange.of( 1 ) )