diff --git a/worldedit-sponge/build.gradle b/worldedit-sponge/build.gradle index 5bae0e26d..1786ce8c6 100644 --- a/worldedit-sponge/build.gradle +++ b/worldedit-sponge/build.gradle @@ -13,7 +13,7 @@ plugins { dependencies { compile project(':worldedit-core') - compile 'org.spongepowered:spongeapi:6.0.0-SNAPSHOT' + compile 'org.spongepowered:spongeapi:7.0.0-SNAPSHOT' testCompile group: 'org.mockito', name: 'mockito-core', version:'1.9.0-rc1' } diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePermissionsProvider.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePermissionsProvider.java index 049bd4ab1..6b324ce80 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePermissionsProvider.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePermissionsProvider.java @@ -25,6 +25,7 @@ import org.spongepowered.api.entity.living.player.Player; import org.spongepowered.api.service.context.Contextual; import org.spongepowered.api.service.permission.PermissionDescription; import org.spongepowered.api.service.permission.PermissionService; +import org.spongepowered.api.service.permission.SubjectReference; import java.util.stream.Collectors; @@ -36,15 +37,14 @@ public class SpongePermissionsProvider { public void registerPermission(CommandCallable command, String permission) { Sponge.getGame().getServiceManager().getRegistration(PermissionService.class).ifPresent((permissionService -> { - PermissionDescription.Builder permissionBuilder = permissionService.getProvider().newDescriptionBuilder(SpongeWorldEdit.inst()).get(); + PermissionDescription.Builder permissionBuilder = permissionService.getProvider().newDescriptionBuilder(SpongeWorldEdit.inst()); permissionBuilder.id(permission).register(); })); } public String[] getGroups(Player player) { - PermissionService permissionService = Sponge.getGame().getServiceManager().getRegistration(PermissionService.class).get().getProvider(); return player.getParents().stream() - .filter(subject -> subject.getContainingCollection().equals(permissionService.getGroupSubjects())) - .map(Contextual::getIdentifier).collect(Collectors.toList()).toArray(new String[0]); + .map(SubjectReference::getSubjectIdentifier) + .collect(Collectors.toList()).toArray(new String[0]); } } diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java index 116920a36..0bc63daeb 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java @@ -43,10 +43,6 @@ import org.spongepowered.api.data.property.block.GroundLuminanceProperty; import org.spongepowered.api.data.property.block.SkyLuminanceProperty; import org.spongepowered.api.entity.EntityType; import org.spongepowered.api.entity.EntityTypes; -import org.spongepowered.api.event.cause.Cause; -import org.spongepowered.api.event.cause.NamedCause; -import org.spongepowered.api.event.cause.entity.spawn.SpawnCause; -import org.spongepowered.api.event.cause.entity.spawn.SpawnTypes; import org.spongepowered.api.world.BlockChangeFlag; import org.spongepowered.api.world.World; @@ -197,7 +193,7 @@ public abstract class SpongeWorld extends AbstractWorld { ); entity.offer(Keys.REPRESENTED_ITEM, SpongeWorldEdit.toSpongeItemStack(item).createSnapshot()); - getWorld().spawnEntity(entity, ENTITY_SPAWN_CAUSE); + getWorld().spawnEntity(entity); } @Override @@ -253,11 +249,6 @@ public abstract class SpongeWorld extends AbstractWorld { protected abstract void applyEntityData(org.spongepowered.api.entity.Entity entity, BaseEntity data); - private static final Cause ENTITY_SPAWN_CAUSE = Cause - .source(SpawnCause.builder().type(SpawnTypes.PLUGIN).build()) - .suggestNamed(NamedCause.SOURCE, SpongeWorldEdit.inst()) - .build(); - @Nullable @Override public Entity createEntity(Location location, BaseEntity entity) { @@ -279,7 +270,7 @@ public abstract class SpongeWorld extends AbstractWorld { new Vector3d(dir.getX(), dir.getY(), dir.getZ()) ); - if (world.spawnEntity(newEnt, ENTITY_SPAWN_CAUSE)) { + if (world.spawnEntity(newEnt)) { return new SpongeEntity(newEnt); } diff --git a/worldedit-sponge/src/main/resources/com/sk89q/worldedit/sponge/adapter/impl/Sponge_1_12_1_Impl$1.class b/worldedit-sponge/src/main/resources/com/sk89q/worldedit/sponge/adapter/impl/Sponge_1_12_1_Impl$1.class new file mode 100644 index 000000000..256a05661 Binary files /dev/null and b/worldedit-sponge/src/main/resources/com/sk89q/worldedit/sponge/adapter/impl/Sponge_1_12_1_Impl$1.class differ diff --git a/worldedit-sponge/src/main/resources/com/sk89q/worldedit/sponge/adapter/impl/Sponge_1_12_1_Impl$SpongeNMSWorld.class b/worldedit-sponge/src/main/resources/com/sk89q/worldedit/sponge/adapter/impl/Sponge_1_12_1_Impl$SpongeNMSWorld.class new file mode 100644 index 000000000..61ce0a7db Binary files /dev/null and b/worldedit-sponge/src/main/resources/com/sk89q/worldedit/sponge/adapter/impl/Sponge_1_12_1_Impl$SpongeNMSWorld.class differ diff --git a/worldedit-sponge/src/main/resources/com/sk89q/worldedit/sponge/adapter/impl/Sponge_1_12_1_Impl$TileEntityBaseBlock.class b/worldedit-sponge/src/main/resources/com/sk89q/worldedit/sponge/adapter/impl/Sponge_1_12_1_Impl$TileEntityBaseBlock.class new file mode 100644 index 000000000..1c5b4c31c Binary files /dev/null and b/worldedit-sponge/src/main/resources/com/sk89q/worldedit/sponge/adapter/impl/Sponge_1_12_1_Impl$TileEntityBaseBlock.class differ diff --git a/worldedit-sponge/src/main/resources/com/sk89q/worldedit/sponge/adapter/impl/Sponge_1_12_1_Impl.class b/worldedit-sponge/src/main/resources/com/sk89q/worldedit/sponge/adapter/impl/Sponge_1_12_1_Impl.class new file mode 100644 index 000000000..cdc162c16 Binary files /dev/null and b/worldedit-sponge/src/main/resources/com/sk89q/worldedit/sponge/adapter/impl/Sponge_1_12_1_Impl.class differ