Upstream merge

This commit is contained in:
MattBDev
2020-03-23 20:47:30 -04:00
parent 692caeea8a
commit e7df3177cc
17 changed files with 387 additions and 90 deletions

View File

@ -35,6 +35,7 @@ public interface BiomeRegistry {
* @param biome the biome
* @return a data object or null if information is not known
*/
@Deprecated
@Nullable
BiomeData getData(BiomeType biome);

View File

@ -40,6 +40,7 @@ public interface BlockRegistry {
* @param blockType the block
* @return The name, or null if it's unknown
*/
@Deprecated
@Nullable
String getName(BlockType blockType);

View File

@ -33,6 +33,7 @@ public interface ItemRegistry {
* @param itemType the item
* @return The name, or null if it's unknown
*/
@Deprecated
@Nullable
String getName(ItemType itemType);