Update to 1.9

pom.xml

@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.8.8-R0.1-SNAPSHOT</version>
+            <version>1.9-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -144,6 +144,7 @@
             </exclusions>
         </dependency>
 
+		<!--
         <dependency>
             <groupId>fr.xephi</groupId>
             <artifactId>authme</artifactId>
@@ -160,6 +161,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        -->
 
         <dependency>
             <groupId>com.griefcraft.lwc</groupId>
@@ -278,8 +280,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.6</source>
+                    <source>1.7</source>
-                    <target>1.6</target>
+                    <target>1.7</target>
                 </configuration>
             </plugin>
             <plugin>

src/main/java/com/Acrobot/Breeze/Configuration/Configuration.java

@@ -1,14 +1,19 @@
 package com.Acrobot.Breeze.Configuration;
 
-import com.Acrobot.Breeze.Configuration.Annotations.PrecededBySpace;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.Scanner;
+
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 
-import java.io.*;
+import com.Acrobot.Breeze.Configuration.Annotations.PrecededBySpace;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.Scanner;
 
 /**
  * A class which can be used to make configs easier to load
@@ -71,18 +76,13 @@ public class Configuration {
      * @return If the file ends with space
      */
     public static boolean endsWithSpace(File file) {
-        try {
+        try (Scanner scanner = new Scanner(file)) {
-            Scanner scanner = new Scanner(file);
             String lastLine = "";
 
             while (scanner.hasNextLine()) {
                 lastLine = scanner.nextLine();
             }
 
-            if (scanner != null) {
-                scanner.close();
-            }
-
             return lastLine.isEmpty();
         } catch (FileNotFoundException e) {
             e.printStackTrace();

src/main/java/com/Acrobot/Breeze/Database/Database.java

@@ -1,10 +1,11 @@
 package com.Acrobot.Breeze.Database;
 
-import javax.persistence.Entity;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
+import javax.persistence.Entity;
+
 /**
  * Database class, which can be used to connect to JDBC
  *
@@ -49,7 +50,7 @@ public class Database {
             return false;
         }
 
-        String tableName = ((javax.persistence.Table) clazz.getAnnotation(javax.persistence.Table.class)).name();
+        String tableName = clazz.getAnnotation(javax.persistence.Table.class).name();
         Table table = getTable(tableName);
 
         EntityParser parser = new EntityParser(clazz);

src/main/java/com/Acrobot/Breeze/Utils/Encoding/Base64.java

@@ -406,7 +406,7 @@ public class Base64 {
 
         byte[] ALPHABET = getAlphabet(options);
 
-        //           1         2         3  
+        //           1         2         3
         // 01234567890123456789012345678901 Bit position
         // --------000000001111111122222222 Array position from threeBytes
         // --------|    ||    ||    ||    | Six bit groups to index ALPHABET
@@ -1106,8 +1106,8 @@ public class Base64 {
             else {
                 // There's a bad input character in the Base64 stream.
                 throw new java.io.IOException(String.format(
-                        "Bad Base64 input character decimal %d in array position %d", ((int) source[i]) & 0xFF, i));
+                        "Bad Base64 input character decimal %d in array position %d", (source[i]) & 0xFF, i));
-            }   // end else: 
+            }   // end else:
         }   // each input character
 
         byte[] out = new byte[outBuffPosn];
@@ -1164,7 +1164,7 @@ public class Base64 {
         boolean dontGunzip = (options & DONT_GUNZIP) != 0;
         if ((bytes != null) && (bytes.length >= 4) && (!dontGunzip)) {
 
-            int head = ((int) bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00);
+            int head = (bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00);
             if (java.util.zip.GZIPInputStream.GZIP_MAGIC == head) {
                 java.io.ByteArrayInputStream bais = null;
                 java.util.zip.GZIPInputStream gzis = null;
@@ -1515,7 +1515,7 @@ public class Base64 {
                 out.close();
             } catch (Exception ex) {
             }
-        }   // end finally    
+        }   // end finally
     }   // end encodeFileToFile
 
 
@@ -1545,7 +1545,7 @@ public class Base64 {
                 out.close();
             } catch (Exception ex) {
             }
-        }   // end finally    
+        }   // end finally
     }   // end decodeFileToFile
     
     
@@ -1683,7 +1683,7 @@ public class Base64 {
                     else {
                         // Must have broken out from above.
                         throw new java.io.IOException("Improperly padded Base64 input.");
-                    }   // end 
+                    }   // end
 
                 }   // end else: decode
             }   // end else: get data

src/main/java/com/Acrobot/ChestShop/Containers/AdminInventory.java

@@ -1,5 +1,11 @@
 package com.Acrobot.ChestShop.Containers;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ListIterator;
+
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.event.inventory.InventoryType;
@@ -7,45 +13,49 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ListIterator;
-
 /**
  * @author Acrobot
  */
 public class AdminInventory implements Inventory {
+    @Override
     public int getSize() {
         return Integer.MAX_VALUE;
     }
 
+    @Override
     public int getMaxStackSize() {
         return Integer.MAX_VALUE;
     }
 
+    @Override
     public void setMaxStackSize(int i) {
     }
 
+    @Override
     public String getName() {
         return "Admin inventory";
     }
 
+    @Override
     public ItemStack getItem(int i) {
         return null;
     }
 
+    @Override
     public void setItem(int i, ItemStack itemStack) {
     }
 
+    @Override
     public HashMap<Integer, ItemStack> addItem(ItemStack... itemStacks) {
         return new HashMap<Integer, ItemStack>();
     }
 
+    @Override
     public HashMap<Integer, ItemStack> removeItem(ItemStack... itemStacks) {
         return new HashMap<Integer, ItemStack>();
     }
 
+    @Override
     public ItemStack[] getContents() {
         return new ItemStack[]{
                 new ItemStack(Material.CHEST, 1),
@@ -53,37 +63,46 @@ public class AdminInventory implements Inventory {
         };
     }
 
+    @Override
     public void setContents(ItemStack[] itemStacks) {
     }
 
+    @Override
     public boolean contains(int i) {
         return true;
     }
 
+    @Override
     public boolean contains(Material material) {
         return true;
     }
 
+    @Override
     public boolean contains(ItemStack itemStack) {
         return true;
     }
 
+    @Override
     public boolean contains(int i, int i1) {
         return true;
     }
 
+    @Override
     public boolean contains(Material material, int i) {
         return true;
     }
 
+    @Override
     public boolean contains(ItemStack itemStack, int i) {
         return true;
     }
 
+    @Override
     public boolean containsAtLeast(ItemStack itemStack, int i) {
         return true;
     }
 
+    @Override
     public HashMap<Integer, ? extends ItemStack> all(int i) {
         HashMap<Integer, ItemStack> items = new HashMap<Integer, ItemStack>();
         items.put(1, new ItemStack(i, Integer.MAX_VALUE));
@@ -91,6 +110,7 @@ public class AdminInventory implements Inventory {
         return items;
     }
 
+    @Override
     public HashMap<Integer, ? extends ItemStack> all(Material material) {
         if (material.getMaxDurability() != 0) {
             HashMap<Integer, ItemStack> items = new HashMap<Integer, ItemStack>();
@@ -105,6 +125,7 @@ public class AdminInventory implements Inventory {
         return all(material.getId());
     }
 
+    @Override
     public HashMap<Integer, ? extends ItemStack> all(ItemStack itemStack) {
         HashMap<Integer, ItemStack> items = new HashMap<Integer, ItemStack>();
 
@@ -116,58 +137,78 @@ public class AdminInventory implements Inventory {
         return items;
     }
 
+    @Override
     public int first(int i) {
         return 0;
     }
 
+    @Override
     public int first(Material material) {
         return 0;
     }
 
+    @Override
     public int first(ItemStack itemStack) {
         return 0;
     }
 
+    @Override
     public int firstEmpty() {
         return 0;
     }
 
+    @Override
     public void remove(int i) {
     }
 
+    @Override
     public void remove(Material material) {
     }
 
+    @Override
     public void remove(ItemStack itemStack) {
     }
 
+    @Override
     public void clear(int i) {
     }
 
+    @Override
     public void clear() {
     }
 
+    @Override
     public List<HumanEntity> getViewers() {
         return new ArrayList<HumanEntity>();
     }
 
+    @Override
     public String getTitle() {
         return "Admin inventory";
     }
 
+    @Override
     public InventoryType getType() {
         return null;
     }
 
+    @Override
     public InventoryHolder getHolder() {
         return null;
     }
 
+    @Override
     public ListIterator<ItemStack> iterator() {
         return null;
     }
 
+    @Override
     public ListIterator<ItemStack> iterator(int i) {
         return null;
     }
+
+    @Override
+    public Location getLocation() {
+        return null;
+    }
 }

src/main/java/com/Acrobot/ChestShop/Listeners/AuthMeChestShopListener.java

@@ -1,18 +1,10 @@
 package com.Acrobot.ChestShop.Listeners;
 
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-import com.Acrobot.ChestShop.Events.PreTransactionEvent;
-import com.Acrobot.ChestShop.Events.PreTransactionEvent.TransactionOutcome;
-
-import fr.xephi.authme.api.NewAPI;
-
 public class AuthMeChestShopListener implements Listener {
 
-    NewAPI AuthMeAPI = NewAPI.getInstance();
+    /*NewAPI AuthMeAPI = NewAPI.getInstance();
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
     public void onPreTransaction(PreTransactionEvent event) {
@@ -31,5 +23,5 @@ public class AuthMeChestShopListener implements Listener {
         }
 
         event.setCancelled(TransactionOutcome.CLIENT_DOES_NOT_HAVE_PERMISSION);
-    }
+    }*/
 }