Fix block drop data being generated in the incorrect place

Fixes half of #421

build.gradle

@@ -48,7 +48,7 @@
 
         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 @@
 
         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/')

src/generated/resources/data/computercraft/loot_tables/blocks/computer_advanced.json

@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",

src/generated/resources/data/computercraft/loot_tables/blocks/computer_normal.json

@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",

src/generated/resources/data/computercraft/loot_tables/blocks/disk_drive.json

@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",

src/generated/resources/data/computercraft/loot_tables/blocks/monitor_advanced.json

@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",

src/generated/resources/data/computercraft/loot_tables/blocks/monitor_normal.json

@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",

src/generated/resources/data/computercraft/loot_tables/blocks/printer.json

@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",

src/generated/resources/data/computercraft/loot_tables/blocks/speaker.json

@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",

src/generated/resources/data/computercraft/loot_tables/blocks/turtle_advanced.json

@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",

src/generated/resources/data/computercraft/loot_tables/blocks/turtle_normal.json

@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",

src/generated/resources/data/computercraft/loot_tables/blocks/wired_modem_full.json

@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",

src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_advanced.json

@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",

src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_normal.json

@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",

src/main/java/dan200/computercraft/data/LootTables.java

@@ -45,8 +45,9 @@ protected void registerLoot( BiConsumer<ResourceLocation, LootTable> add )
 
     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 @@ private static void basicDrop( BiConsumer<ResourceLocation, LootTable> add, Bloc
 
     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 ) )