Merge master again

This commit is contained in:
Kenzie Togami
2019-04-26 01:25:42 -07:00
36 changed files with 1088 additions and 158 deletions

View File

@ -69,6 +69,12 @@ class ForgePlatform extends AbstractPlatform implements MultiUserPlatform {
return ForgeRegistries.getInstance();
}
@Override
public int getDataVersion() {
// TODO switch to SharedConstants in 1.14
return 1631;
}
@Override
public boolean isValidMobType(String type) {
return net.minecraftforge.registries.ForgeRegistries.ENTITIES.containsKey(new ResourceLocation(type));