Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-11 20:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

registry changes

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeItemRegistry.java
View File

@ -32,7 +32,7 @@ public class ForgeItemRegistry implements ItemRegistry {
public BaseItem createFromId(String id) {
Item match = Item.REGISTRY.getObject(new ResourceLocation(id));
if (match != null) {
return new BaseItem(ItemTypes.getItemType(id));
return new BaseItem(ItemTypes.get(id));
} else {
return null;
}

2
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlayer.java
View File

@ -62,7 +62,7 @@ public class ForgePlayer extends AbstractPlayerActor {
@Override
public BaseItemStack getItemInHand(HandSide handSide) {
ItemStack is = this.player.getHeldItem(handSide == HandSide.MAIN_HAND ? EnumHand.MAIN_HAND : EnumHand.OFF_HAND);
return new BaseItemStack(ItemTypes.getItemType(ForgeRegistries.ITEMS.getKey(is.getItem()).toString()));
return new BaseItemStack(ItemTypes.get(ForgeRegistries.ITEMS.getKey(is.getItem()).toString()));
}
@Override

2
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java
View File

@ -125,7 +125,7 @@ public class ForgeWorldEdit {
}
for (Block block : REGISTRY) {
BlockTypes.registerBlock(new BlockType(REGISTRY.getNameForObject(block).toString()));
BlockTypes.register(new BlockType(REGISTRY.getNameForObject(block).toString()));
}
}