Merge pull request #91 from GreWeMa/rewrite

A few perfomance fixes

Author: Loki

src/main/java/com/codehusky/huskycrates/HuskyCrates.java

@@ -74,6 +74,7 @@ public class HuskyCrates {
     public Path generatedItemConfigPath;
     public ConfigurationLoader<CommentedConfigurationNode> generatedItemConfig;
 
+    //TODO unused variable
     public Cause genericCause;
 
     public static HuskyCrates instance;

src/main/java/com/codehusky/huskycrates/Registry.java

@@ -523,8 +523,9 @@ public void pushDirty() {
             }
             dirtyPhysicalCrates.clear();
 
-            for(UUID playerUUID: dirtyVirtualKeys.keySet()){
-                for(String keyID : dirtyVirtualKeys.get(playerUUID)){
+            for(Map.Entry<UUID, HashSet<String>> entry : dirtyVirtualKeys.entrySet()){
+                UUID playerUUID = entry.getKey();
+                for(String keyID : entry.getValue()){
                     //create or update
                     PreparedStatement statement = connection.prepareStatement("SELECT * FROM KEYBALANCES WHERE userUUID = ? AND keyID = ?");
                     statement.setString(1,playerUUID.toString());
@@ -579,8 +580,9 @@ public void pushDirty() {
             }
             dirtyKeysInCirculation.clear();
 
-            for(UUID playerUUID : dirtyLastCrateUse.keySet()){
-                for(String crateID : dirtyLastCrateUse.get(playerUUID)){
+            for(Map.Entry<UUID, HashSet<String>> entry : dirtyLastCrateUse.entrySet()){
+                UUID playerUUID = entry.getKey();
+                for(String crateID : entry.getValue()){
                     /*
                     TABLE LASTUSED (userUUID CHARACTER, crateID CHARACTER, lastUsed BIGINT)
                      */

src/main/java/com/codehusky/huskycrates/command/BalanceCommand.java

@@ -14,6 +14,7 @@
 import org.spongepowered.api.text.serializer.TextSerializers;
 
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -64,8 +65,9 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
 
         HashMap<String, Integer> balances = HuskyCrates.registry.getVirtualKeyBalances(balanceToUse);
 
-        for(String keyID : balances.keySet()){
-            src.sendMessage(HuskyCrates.balanceCommandMessages.getBalanceRow(HuskyCrates.registry.getKey(keyID).getName(),keyID,balances.get(keyID)));
+        for(Map.Entry<String, Integer> entry : balances.entrySet()){
+            String keyID = entry.getKey();
+            src.sendMessage(HuskyCrates.balanceCommandMessages.getBalanceRow(HuskyCrates.registry.getKey(keyID).getName(),keyID,entry.getValue()));
         }
 
         if(balances.size() == 0){

src/main/java/com/codehusky/huskycrates/crate/physical/HologramInstance.java

@@ -18,8 +18,10 @@ public class HologramInstance {
     private Location<World> location;
     private boolean isEntity;
 
+    //TODO unused variable
     private Entity assocEntity;
 
+    //TODO unused variable
     private List<ArmorStand> armorStands;
 
     public HologramInstance(Hologram hologram, Location<World> location, boolean isEntity){
@@ -58,7 +60,7 @@ public void init() {
                         location.getPosition()
                             .clone()
                             .add(0.5,1,0.5)
-                            .add(0,((isEntity)?hologram.getEntityYOffset():hologram.getEntityYOffset()) - (linenum * 0.23),0));
+                            .add(0,hologram.getEntityYOffset() - (linenum * 0.23),0));
 
             as.offer(Keys.HAS_GRAVITY,false);
             as.offer(Keys.ARMOR_STAND_IS_SMALL,true);

src/main/java/com/codehusky/huskycrates/crate/virtual/Crate.java

@@ -57,6 +57,7 @@ public class Crate {
 
     private long cooldownSeconds;
 
+    //TODO unused variable
     private BlockType defaultBlock;
 
     private Boolean useLocalKey;
@@ -271,16 +272,16 @@ public boolean testKey(ItemStack stack){
         if(useLocalKey){
             if(localKey.testKey(stack)) return true;
         }
-        for(String thisid : acceptedKeys.keySet()){
-            Key potential = HuskyCrates.registry.getKey(thisid);
-            if(potential.testKey(stack) && stack.getQuantity() >= acceptedKeys.get(thisid)) return true;
+        for(Map.Entry<String, Integer> entry : acceptedKeys.entrySet()){
+            Key potential = HuskyCrates.registry.getKey(entry.getKey());
+            if(potential.testKey(stack) && stack.getQuantity() >= entry.getValue()) return true;
         }
         return false;
     }
 
     public boolean testVirtualKey(UUID playerUUID){
-        for(String keyID : acceptedKeys.keySet()){
-            if(HuskyCrates.registry.getVirtualKeyBalance(playerUUID,keyID) >= acceptedKeys.get(keyID)){
+        for(Map.Entry<String, Integer> entry : acceptedKeys.entrySet()){
+            if(HuskyCrates.registry.getVirtualKeyBalance(playerUUID,entry.getKey()) >= entry.getValue()){
                 return true;
             }
         }
@@ -289,8 +290,9 @@ public boolean testVirtualKey(UUID playerUUID){
 
     public void consumeVirtualKeys(UUID playerUUID){
         if(testVirtualKey(playerUUID)){
-            for(String keyID : acceptedKeys.keySet()){
-                int consumed = acceptedKeys.get(keyID);
+            for(Map.Entry<String, Integer> entry : acceptedKeys.entrySet()){
+                String keyID = entry.getKey();
+                int consumed = entry.getValue();
                 if(HuskyCrates.registry.getVirtualKeyBalance(playerUUID,keyID) >= consumed){
                     HuskyCrates.registry.removeVirtualKeys(playerUUID,keyID,consumed);
                     System.out.println(consumed);

src/main/java/com/codehusky/huskycrates/exception/ConfigError.java

@@ -15,13 +15,13 @@ public String getMessage() {
     }
 
     public static String readablePath(Object[] path){
-        String readablePath = "";
+        StringBuilder readablePath = new StringBuilder();
         for(int i = 0; i < path.length; i++){
-            readablePath += path[i];
+            readablePath.append(path[i]);
             if(i+1 < path.length){
-                readablePath += ".";
+                readablePath.append(".");
             }
         }
-        return readablePath;
+        return readablePath.toString();
     }
 }