From eb276f9cfce5b6229e207ad286f640e100dfd05c Mon Sep 17 00:00:00 2001 From: modmuss50 <modmuss50@gmail.com> Date: Wed, 15 Apr 2020 16:42:48 +0100 Subject: [PATCH] 20w16a --- build.gradle | 4 ++-- fabric-object-builders-v0/build.gradle | 2 +- .../fabricmc/fabric/api/block/BlockSettingsExtensions.java | 2 +- .../fabric/mixin/object/builder/BlockSettingsHooks.java | 2 +- fabric-registry-sync-v0/build.gradle | 2 +- .../impl/registry/sync/trackers/vanilla/BlockInitTracker.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 6a173e7bf..141a9c061 100644 --- a/build.gradle +++ b/build.gradle @@ -12,8 +12,8 @@ plugins { def ENV = System.getenv() class Globals { - static def baseVersion = "0.5.10" - static def mcVersion = "20w15a" + static def baseVersion = "0.5.11" + static def mcVersion = "20w16a" static def yarnVersion = "+build.1" } diff --git a/fabric-object-builders-v0/build.gradle b/fabric-object-builders-v0/build.gradle index abda775b2..4221493b6 100644 --- a/fabric-object-builders-v0/build.gradle +++ b/fabric-object-builders-v0/build.gradle @@ -1,5 +1,5 @@ archivesBaseName = "fabric-object-builders" -version = getSubprojectVersion(project, "0.2.3") +version = getSubprojectVersion(project, "0.2.4") dependencies { compile project(path: ':fabric-api-base', configuration: 'dev') diff --git a/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/api/block/BlockSettingsExtensions.java b/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/api/block/BlockSettingsExtensions.java index c88a5b282..cc78087ca 100644 --- a/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/api/block/BlockSettingsExtensions.java +++ b/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/api/block/BlockSettingsExtensions.java @@ -54,7 +54,7 @@ public final class BlockSettingsExtensions { } public static void drops(Settings settings, Identifier dropTableId) { - ((BlockSettingsHooks) settings).setDropTableId(dropTableId); + ((BlockSettingsHooks) settings).setLootTableId(dropTableId); } public static void sounds(Settings settings, BlockSoundGroup soundGroup) { diff --git a/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/mixin/object/builder/BlockSettingsHooks.java b/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/mixin/object/builder/BlockSettingsHooks.java index db20adfed..fb973f649 100644 --- a/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/mixin/object/builder/BlockSettingsHooks.java +++ b/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/mixin/object/builder/BlockSettingsHooks.java @@ -45,7 +45,7 @@ public interface BlockSettingsHooks { void setMaterialColorFactory(Function<BlockState, MaterialColor> materialColorFunction); @Accessor - void setDropTableId(Identifier dropTableId); + void setLootTableId(Identifier dropTableId); @Invoker Block.Settings invokeSounds(BlockSoundGroup group); diff --git a/fabric-registry-sync-v0/build.gradle b/fabric-registry-sync-v0/build.gradle index b22488897..ea2a2f36a 100644 --- a/fabric-registry-sync-v0/build.gradle +++ b/fabric-registry-sync-v0/build.gradle @@ -1,5 +1,5 @@ archivesBaseName = "fabric-registry-sync-v0" -version = getSubprojectVersion(project, "0.2.9") +version = getSubprojectVersion(project, "0.2.10") dependencies { compile project(path: ':fabric-api-base', configuration: 'dev') diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/vanilla/BlockInitTracker.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/vanilla/BlockInitTracker.java index 91b7b94e8..f6ed31b2a 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/vanilla/BlockInitTracker.java +++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/vanilla/BlockInitTracker.java @@ -42,6 +42,6 @@ public final class BlockInitTracker implements RegistryEntryAddedCallback<Block> // if false, getDropTableId() will generate an invalid drop table ID assert id.equals(registry.getId(object)); - object.getDropTableID(); + object.getLootTableId(); } }