From b8abe05939320c3b9c22c3a6cdfd9d25ec28621d Mon Sep 17 00:00:00 2001 From: Nick Conde Date: Tue, 31 Mar 2015 08:13:29 -0700 Subject: [PATCH] Update plugin.yml --- .travis.yml | 5 +++++ README.md | 2 +- .../sponge/service/command/SpongeCommand.java | 12 ++++++------ .../voxelsniper/sponge/world/SpongeChunk.java | 2 +- .../voxelsniper/sponge/world/SpongeWorld.java | 2 +- src/main/resources/plugin.yml | 2 +- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 652bb0d4..29c9eff1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,9 @@ language: java +cache: +directories: +- $HOME/.gradle +- .gradle +sudo: false notifications: email: false install: true diff --git a/README.md b/README.md index 951690d3..ebe825eb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -VoxelSniper-Bukkit [![Build Status](https://travis-ci.org/TVPT/VoxelSniper.svg?branch=master)](https://travis-ci.org/TVPT/VoxelSniper) +VoxelSniper [![Build Status](https://travis-ci.org/TVPT/VoxelSniper.svg?branch=master)](https://travis-ci.org/TVPT/VoxelSniper) =============== The premiere long-distance brush editor implementation for [Bukkit][Bukkit] and [Sponge][Sponge]. Documentation can be found at the [VoxelGunsmith wiki][VoxelSniperWiki]. diff --git a/src/main/java/com/voxelplugineering/voxelsniper/sponge/service/command/SpongeCommand.java b/src/main/java/com/voxelplugineering/voxelsniper/sponge/service/command/SpongeCommand.java index 29e7a395..3dd970ec 100644 --- a/src/main/java/com/voxelplugineering/voxelsniper/sponge/service/command/SpongeCommand.java +++ b/src/main/java/com/voxelplugineering/voxelsniper/sponge/service/command/SpongeCommand.java @@ -25,10 +25,10 @@ import java.util.List; +import org.spongepowered.api.text.Texts; import org.spongepowered.api.util.command.CommandCallable; import org.spongepowered.api.util.command.CommandException; -import com.google.common.base.Optional; import com.google.common.collect.Lists; import com.voxelplugineering.voxelsniper.core.Gunsmith; import com.voxelplugineering.voxelsniper.core.commands.Command; @@ -114,25 +114,25 @@ public boolean testPermission(org.spongepowered.api.util.command.CommandSource s * {@inheritDoc} */ @Override - public Optional getShortDescription() + public String getShortDescription(org.spongepowered.api.util.command.CommandSource source) { - return Optional.of(this.command.getHelpMsg()); + return this.command.getHelpMsg(); } /** * {@inheritDoc} */ @Override - public Optional getHelp() + public org.spongepowered.api.text.Text getHelp(org.spongepowered.api.util.command.CommandSource source) { - return Optional.of(this.command.getHelpMsg()); + return Texts.of(this.command.getHelpMsg()); } /** * {@inheritDoc} */ @Override - public String getUsage() + public String getUsage(org.spongepowered.api.util.command.CommandSource source) { return this.command.getHelpMsg(); } diff --git a/src/main/java/com/voxelplugineering/voxelsniper/sponge/world/SpongeChunk.java b/src/main/java/com/voxelplugineering/voxelsniper/sponge/world/SpongeChunk.java index c8221615..3fcce60d 100644 --- a/src/main/java/com/voxelplugineering/voxelsniper/sponge/world/SpongeChunk.java +++ b/src/main/java/com/voxelplugineering/voxelsniper/sponge/world/SpongeChunk.java @@ -72,7 +72,7 @@ public Optional getBlock(int { return Optional.absent(); } - org.spongepowered.api.block.BlockLoc b = getThis().getFullBlock(x, y, z); + org.spongepowered.api.world.Location b = getThis().getFullBlock(x, y, z); CommonLocation l = new CommonLocation(this.getWorld(), b.getX(), b.getY(), b.getZ()); Optional m = ((SpongeWorld) this.getWorld()).getMaterialRegistry().getMaterial(b.getType()); if (!m.isPresent()) diff --git a/src/main/java/com/voxelplugineering/voxelsniper/sponge/world/SpongeWorld.java b/src/main/java/com/voxelplugineering/voxelsniper/sponge/world/SpongeWorld.java index 77537bad..28cace0b 100644 --- a/src/main/java/com/voxelplugineering/voxelsniper/sponge/world/SpongeWorld.java +++ b/src/main/java/com/voxelplugineering/voxelsniper/sponge/world/SpongeWorld.java @@ -94,7 +94,7 @@ public Optional getBlock(int { return Optional.absent(); } - org.spongepowered.api.block.BlockLoc b = getThis().getFullBlock(x, y, z); + org.spongepowered.api.world.Location b = getThis().getFullBlock(x, y, z); CommonLocation l = new CommonLocation(this, b.getX(), b.getY(), b.getZ()); Optional m = this.materials.getMaterial(b.getType()); if (!m.isPresent()) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index a0f0cc35..a082d5bd 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: VoxelSniper -main: com.voxelplugineering.voxelsniper.VoxelSniperBukkit +main: com.voxelplugineering.voxelsniper.bukkit.VoxelSniperBukkit version: 7.0.0 website: http://thevoxelbox.com authors: [gabizou, Deamon5550]