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

Fixed items not being registered

Browse Source
This commit is contained in:
Matthew Miller
2018-07-12 22:42:50 +10:00
parent ca06a05117
commit 39c6a5e958
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePermissionsProvider.java
View File

@ -28,11 +28,11 @@ import net.minecraftforge.fml.common.FMLCommonHandler;
public interface ForgePermissionsProvider {
public boolean hasPermission(EntityPlayerMP player, String permission);
boolean hasPermission(EntityPlayerMP player, String permission);
public void registerPermission(ICommand command, String permission);
void registerPermission(ICommand command, String permission);
public static class VanillaPermissionsProvider implements ForgePermissionsProvider {
class VanillaPermissionsProvider implements ForgePermissionsProvider {
private ForgePlatform platform;
@ -52,7 +52,7 @@ public interface ForgePermissionsProvider {
public void registerPermission(ICommand command, String permission) {}
}
public static class SpongePermissionsProvider implements ForgePermissionsProvider {
class SpongePermissionsProvider implements ForgePermissionsProvider {
@Override
public boolean hasPermission(EntityPlayerMP player, String permission) {

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

@ -20,7 +20,6 @@
package com.sk89q.worldedit.forge;
import static com.google.common.base.Preconditions.checkNotNull;
import static net.minecraft.block.Block.REGISTRY;
import com.google.common.base.Joiner;
import com.sk89q.worldedit.LocalSession;
@ -32,6 +31,8 @@ import com.sk89q.worldedit.forge.net.LeftClickAirEventMessage;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.item.ItemType;
import com.sk89q.worldedit.world.item.ItemTypes;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
@ -124,8 +125,12 @@ public class ForgeWorldEdit {
this.provider = new ForgePermissionsProvider.VanillaPermissionsProvider(platform);
}
for (Block block : REGISTRY) {
BlockTypes.register(new BlockType(REGISTRY.getNameForObject(block).toString()));
for (Block block : Block.REGISTRY) {
BlockTypes.register(new BlockType(Block.REGISTRY.getNameForObject(block).toString()));
}
for (Item item : Item.REGISTRY) {
ItemTypes.register(new ItemType(Item.REGISTRY.getNameForObject(item).toString()));
}
}