Replace javafx Pair by lang3 one.

MinusKube · Sep 30, 2017 · e9bcec5 · e9bcec5
1 parent 9f2d3fc
commit e9bcec5
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/modules/smart-invs.iml b/.idea/modules/smart-invs.iml
diff --git a/.idea/modules/smart-invs_main.iml b/.idea/modules/smart-invs_main.iml
diff --git a/.idea/modules/smart-invs_test.iml b/.idea/modules/smart-invs_test.iml
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ repositories {
 }
 
 dependencies {
-    compile 'fr.minuskube.inv:smart-invs:1.1.1'
+    compile 'fr.minuskube.inv:smart-invs:1.1.2'
 }
 ```
 
@@ -43,7 +43,7 @@ dependencies {
 <dependency>
   <groupId>fr.minuskube.inv</groupId>
   <artifactId>smart-invs</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2</version>
 </dependency>
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 group 'fr.minuskube.inv'
-version '1.1.1'
+version '1.1.2'
 
 apply plugin: 'java'
 apply plugin: 'maven'
@@ -36,6 +36,7 @@ repositories {
 
 dependencies {
     provided 'org.spigotmc:spigot-api:1.11.2-R0.1-SNAPSHOT'
+    provided 'org.apache.commons:commons-lang3:3.5'
 }
 
 jar { archiveName = 'SmartInvs-' + project.version + '.jar' }

diff --git a/src/main/java/fr/minuskube/inv/content/SlotIterator.java b/src/main/java/fr/minuskube/inv/content/SlotIterator.java
@@ -2,7 +2,7 @@
 
 import fr.minuskube.inv.ClickableItem;
 import fr.minuskube.inv.SmartInventory;
-import javafx.util.Pair;
+import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.HashSet;
 import java.util.Optional;
@@ -96,7 +96,7 @@ public SlotIterator previous() {
                         break;
                 }
             }
-            while((row != 0 || column != 0) && blacklisted.contains(new Pair<>(row, column)));
+            while((row != 0 || column != 0) && blacklisted.contains(Pair.of(row, column)));
 
             return this;
         }
@@ -122,14 +122,14 @@ public SlotIterator next() {
                         break;
                 }
             }
-            while(!ended() && blacklisted.contains(new Pair<>(row, column)));
+            while(!ended() && blacklisted.contains(Pair.of(row, column)));
 
             return this;
         }
 
         @Override
         public SlotIterator blacklist(int row, int column) {
-            this.blacklisted.add(new Pair<>(row, column));
+            this.blacklisted.add(Pair.of(row, column));
             return this;
         }
 

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: SmartInvs
-version: 1.1.1
+version: 1.1.2
 description: Inventory API for your Bukkit Plugins.
 author: MinusKube
 website: https://github.com/MinusKube/SmartInvs