Skip to content

Commit 08a0342

Browse files
committed
Fix block drop data being generated in the incorrect place
Fixes half of #421
1 parent 48cb032 commit 08a0342

File tree

14 files changed

+18
-4
lines changed

14 files changed

+18
-4
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ minecraft {
4848

4949
server {
5050
workingDirectory project.file('run')
51-
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
51+
property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
5252
property 'forge.logging.console.level', 'debug'
5353

5454
mods {
@@ -60,7 +60,7 @@ minecraft {
6060

6161
data {
6262
workingDirectory project.file('run')
63-
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
63+
property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
6464
property 'forge.logging.console.level', 'debug'
6565

6666
args '--mod', 'computercraft', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')

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

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ protected void registerLoot( BiConsumer<ResourceLocation, LootTable> add )
4545

4646
private static void basicDrop( BiConsumer<ResourceLocation, LootTable> add, Block block )
4747
{
48-
add.accept( block.getRegistryName(), LootTable
48+
add.accept( block.getLootTable(), LootTable
4949
.builder()
50+
.setParameterSet( LootParameterSets.BLOCK )
5051
.addLootPool( LootPool.builder()
5152
.name( "main" )
5253
.rolls( ConstantRange.of( 1 ) )
@@ -57,8 +58,9 @@ private static void basicDrop( BiConsumer<ResourceLocation, LootTable> add, Bloc
5758

5859
private static void computerDrop( BiConsumer<ResourceLocation, LootTable> add, Block block )
5960
{
60-
add.accept( block.getRegistryName(), LootTable
61+
add.accept( block.getLootTable(), LootTable
6162
.builder()
63+
.setParameterSet( LootParameterSets.BLOCK )
6264
.addLootPool( LootPool.builder()
6365
.name( "main" )
6466
.rolls( ConstantRange.of( 1 ) )

0 commit comments

Comments
 (0)