registry changes

This commit is contained in:
kashike
2018-07-05 01:48:37 -07:00
committed by Matthew Miller
parent a48c319e7e
commit d33e2e98aa
25 changed files with 1496 additions and 1528 deletions

View File

@ -66,7 +66,7 @@ public class SpongePlayer extends AbstractPlayerActor {
public BaseItemStack getItemInHand(HandSide handSide) {
Optional<ItemStack> is = this.player.getItemInHand(handSide == HandSide.MAIN_HAND
? HandTypes.MAIN_HAND : HandTypes.OFF_HAND);
return is.map(itemStack -> new BaseItemStack(ItemTypes.getItemType(itemStack.getType().getId()))).orElse(null);
return is.map(itemStack -> new BaseItemStack(ItemTypes.get(itemStack.getType().getId()))).orElse(null);
}
@Override

View File

@ -135,11 +135,11 @@ public class SpongeWorldEdit {
for (BlockType blockType : Sponge.getRegistry().getAllOf(BlockType.class)) {
// TODO Handle blockstate stuff
com.sk89q.worldedit.world.block.BlockTypes.registerBlock(new com.sk89q.worldedit.world.block.BlockType(blockType.getId()));
com.sk89q.worldedit.world.block.BlockTypes.register(new com.sk89q.worldedit.world.block.BlockType(blockType.getId()));
}
for (ItemType itemType : Sponge.getRegistry().getAllOf(ItemType.class)) {
ItemTypes.registerItem(new com.sk89q.worldedit.world.item.ItemType(itemType.getId()));
ItemTypes.register(new com.sk89q.worldedit.world.item.ItemType(itemType.getId()));
}
WorldEdit.getInstance().getPlatformManager().register(platform);