Backport for Sponge API 4.x

Zerthick · Aug 27, 2016 · 8f518d5 · 8f518d5
1 parent 41daaa8
commit 8f518d5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -33,5 +33,5 @@ repositories {
 }
 
 dependencies {
-    compile 'org.spongepowered:spongeapi:5.0.0-SNAPSHOT'
+    compile 'org.spongepowered:spongeapi:4.0.0'
 }
diff --git a/src/main/java/io/github/zerthick/playershopsrpg/PlayerShopsRPG.java b/src/main/java/io/github/zerthick/playershopsrpg/PlayerShopsRPG.java
@@ -53,7 +53,7 @@
 
 @Plugin(id = "playershopsrpg",
         name = "PlayerShopsRPG",
-        version = "0.4.0",
+        version = "0.4.1",
         description = "A region-based player shop plugin.")
 public class PlayerShopsRPG {
 

diff --git a/...ava/io/github/zerthick/playershopsrpg/cmd/cmdexecutors/shop/item/ShopAddItemExecutor.java b/...ava/io/github/zerthick/playershopsrpg/cmd/cmdexecutors/shop/item/ShopAddItemExecutor.java
@@ -25,7 +25,6 @@
 import org.spongepowered.api.command.CommandResult;
 import org.spongepowered.api.command.CommandSource;
 import org.spongepowered.api.command.args.CommandContext;
-import org.spongepowered.api.data.type.HandTypes;
 import org.spongepowered.api.item.inventory.ItemStack;
 import org.spongepowered.api.plugin.PluginContainer;
 
@@ -42,7 +41,7 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
 
         return super.executeTransaction(src, args, (player, arg, shop) -> {
 
-            Optional<ItemStack> itemStackOptional = player.getItemInHand(HandTypes.MAIN_HAND);
+            Optional<ItemStack> itemStackOptional = player.getItemInHand();
 
             if (itemStackOptional.isPresent()) {
 

diff --git a/.../io/github/zerthick/playershopsrpg/cmd/cmdexecutors/shop/item/ShopCreateItemExecutor.java b/.../io/github/zerthick/playershopsrpg/cmd/cmdexecutors/shop/item/ShopCreateItemExecutor.java
@@ -26,7 +26,6 @@
 import org.spongepowered.api.command.CommandResult;
 import org.spongepowered.api.command.CommandSource;
 import org.spongepowered.api.command.args.CommandContext;
-import org.spongepowered.api.data.type.HandTypes;
 import org.spongepowered.api.item.inventory.ItemStack;
 import org.spongepowered.api.plugin.PluginContainer;
 import org.spongepowered.api.text.Text;
@@ -44,9 +43,9 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
 
         return super.executeTransaction(src, args, (player, arg, shop) -> {
 
-            if (player.getItemInHand(HandTypes.MAIN_HAND).isPresent()) {
+            if (player.getItemInHand().isPresent()) {
 
-                ItemStack item = player.getItemInHand(HandTypes.MAIN_HAND).get();
+                ItemStack item = player.getItemInHand().get();
                 ShopTransactionResult transactionResult = ShopTransactionResult.EMPTY;
 
                 //Check if this shop is allowed to hold this item