diff --git a/.gitignore b/.gitignore
index b5225efb..bcb4bfcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,6 @@
.classpath
.project
CitizensAPI.jar
-*.lnk
\ No newline at end of file
+*.lnk
+.idea/
+*.iml
diff --git a/pom.xml b/pom.xml
index 9db9dbe8..fa3665f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,12 @@
net.citizensnpcs
citizensapi
- 2.0.13-SNAPSHOT
+ 2.0.14-SNAPSHOT
CitizensAPI
UTF-8
- 1.7.8-R0.1-SNAPSHOT
+ 1.8-R0.1-SNAPSHOT
1.4.12
Unknown
diff --git a/src/main/java/net/citizensnpcs/api/ai/event/NavigatorCallback.java b/src/main/java/net/citizensnpcs/api/ai/event/NavigatorCallback.java
index ee871d4b..a4163e36 100644
--- a/src/main/java/net/citizensnpcs/api/ai/event/NavigatorCallback.java
+++ b/src/main/java/net/citizensnpcs/api/ai/event/NavigatorCallback.java
@@ -1,7 +1,5 @@
package net.citizensnpcs.api.ai.event;
-import javax.annotation.Nullable;
-
public interface NavigatorCallback {
- void onCompletion(@Nullable CancelReason cancelReason);
+ void onCompletion(CancelReason cancelReason);
}
diff --git a/src/main/java/net/citizensnpcs/api/ai/goals/MoveToGoal.java b/src/main/java/net/citizensnpcs/api/ai/goals/MoveToGoal.java
index 2c9caff1..5e316bc7 100644
--- a/src/main/java/net/citizensnpcs/api/ai/goals/MoveToGoal.java
+++ b/src/main/java/net/citizensnpcs/api/ai/goals/MoveToGoal.java
@@ -1,7 +1,5 @@
package net.citizensnpcs.api.ai.goals;
-import javax.annotation.Nullable;
-
import net.citizensnpcs.api.ai.event.CancelReason;
import net.citizensnpcs.api.ai.event.NavigatorCallback;
import net.citizensnpcs.api.ai.tree.BehaviorGoalAdapter;
@@ -43,7 +41,7 @@ public boolean shouldExecute() {
npc.getNavigator().setTarget(target);
npc.getNavigator().getLocalParameters().addSingleUseCallback(new NavigatorCallback() {
@Override
- public void onCompletion(@Nullable CancelReason cancelReason) {
+ public void onCompletion(CancelReason cancelReason) {
finished = true;
reason = cancelReason;
}
diff --git a/src/main/java/net/citizensnpcs/api/ai/goals/TargetNearbyEntityGoal.java b/src/main/java/net/citizensnpcs/api/ai/goals/TargetNearbyEntityGoal.java
index 18731702..9e2b3727 100644
--- a/src/main/java/net/citizensnpcs/api/ai/goals/TargetNearbyEntityGoal.java
+++ b/src/main/java/net/citizensnpcs/api/ai/goals/TargetNearbyEntityGoal.java
@@ -4,8 +4,6 @@
import java.util.EnumSet;
import java.util.Set;
-import javax.annotation.Nullable;
-
import net.citizensnpcs.api.ai.event.CancelReason;
import net.citizensnpcs.api.ai.event.NavigatorCallback;
import net.citizensnpcs.api.ai.tree.BehaviorGoalAdapter;
@@ -63,7 +61,7 @@ public boolean shouldExecute() {
npc.getNavigator().setTarget(target, aggressive);
npc.getNavigator().getLocalParameters().addSingleUseCallback(new NavigatorCallback() {
@Override
- public void onCompletion(@Nullable CancelReason cancelReason) {
+ public void onCompletion(CancelReason cancelReason) {
reason = cancelReason;
finished = true;
}
diff --git a/src/main/java/net/citizensnpcs/api/ai/tree/Selector.java b/src/main/java/net/citizensnpcs/api/ai/tree/Selector.java
index 3798aae4..7bc18089 100644
--- a/src/main/java/net/citizensnpcs/api/ai/tree/Selector.java
+++ b/src/main/java/net/citizensnpcs/api/ai/tree/Selector.java
@@ -5,8 +5,6 @@
import java.util.List;
import java.util.Random;
-import javax.annotation.Nullable;
-
import com.google.common.base.Function;
/**
@@ -112,7 +110,7 @@ public Builder retryChildren() {
* Sets whether to retry child {@link Behavior}s when they return
* {@link BehaviorStatus#FAILURE}.
*
- * @param retry
+ * @param b
* Whether to retry children
*/
public Builder retryChildren(boolean b) {
@@ -145,7 +143,7 @@ public static Builder selecting(Collection behaviors) {
private static final Random RANDOM = new Random();
private static final Function, Behavior> RANDOM_SELECTION = new Function, Behavior>() {
@Override
- public Behavior apply(@Nullable List behaviors) {
+ public Behavior apply(List behaviors) {
return behaviors.get(RANDOM.nextInt(behaviors.size()));
}
};
diff --git a/src/main/java/net/citizensnpcs/api/ai/tree/Selectors.java b/src/main/java/net/citizensnpcs/api/ai/tree/Selectors.java
index 45116e80..5724bcf9 100644
--- a/src/main/java/net/citizensnpcs/api/ai/tree/Selectors.java
+++ b/src/main/java/net/citizensnpcs/api/ai/tree/Selectors.java
@@ -6,8 +6,6 @@
import java.util.Comparator;
import java.util.List;
-import javax.annotation.Nullable;
-
import com.google.common.base.Function;
import com.google.common.base.Preconditions;
@@ -23,7 +21,7 @@ private PrioritySelection(Comparator comparator) {
}
@Override
- public Behavior apply(@Nullable List input) {
+ public Behavior apply(List input) {
Collections.sort(input, comparator);
return input.get(input.size() - 1);
}
diff --git a/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java b/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java
index 04d2b79e..ec157339 100644
--- a/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java
+++ b/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java
@@ -5,8 +5,6 @@
import java.util.Set;
import java.util.UUID;
-import javax.annotation.Nullable;
-
import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.ai.GoalController;
import net.citizensnpcs.api.ai.SimpleGoalController;
@@ -287,7 +285,7 @@ public void load(final DataKey root) {
Set keys = Sets.newHashSet(root.getRelative("traits").getSubKeys());
Iterables.addAll(keys, Iterables.transform(Splitter.on(',').split(traitNames), new Function() {
@Override
- public DataKey apply(@Nullable String input) {
+ public DataKey apply(String input) {
return root.getRelative("traits." + input);
}
}));
diff --git a/src/main/java/net/citizensnpcs/api/util/MemoryDataKey.java b/src/main/java/net/citizensnpcs/api/util/MemoryDataKey.java
index 43e7a5b7..5f864aa8 100644
--- a/src/main/java/net/citizensnpcs/api/util/MemoryDataKey.java
+++ b/src/main/java/net/citizensnpcs/api/util/MemoryDataKey.java
@@ -4,8 +4,6 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nullable;
-
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.MemoryConfiguration;
@@ -100,7 +98,7 @@ public Iterable getSubKeys() {
Set keys = head.getKeys(false);
return Iterables.transform(keys, new Function() {
@Override
- public DataKey apply(@Nullable String input) {
+ public DataKey apply(String input) {
return new MemoryDataKey(root, getKeyFor(input));
}
});
diff --git a/src/main/java/net/citizensnpcs/api/util/NBTStorage.java b/src/main/java/net/citizensnpcs/api/util/NBTStorage.java
index 3f33d1e8..bb96795c 100644
--- a/src/main/java/net/citizensnpcs/api/util/NBTStorage.java
+++ b/src/main/java/net/citizensnpcs/api/util/NBTStorage.java
@@ -91,7 +91,14 @@ public boolean load() {
ex.printStackTrace();
return false;
} finally {
- Closeables.closeQuietly(stream);
+ try {
+ if (stream != null) {
+ stream.close();
+ }
+ }
+ catch (Exception e) {
+ e.getCause(); // Do nothing
+ }
}
return true;
}
@@ -114,7 +121,14 @@ public void save() {
} catch (IOException ex) {
ex.printStackTrace();
} finally {
- Closeables.closeQuietly(stream);
+ try {
+ if (stream != null) {
+ stream.close();
+ }
+ }
+ catch (Exception e) {
+ e.getCause(); // Do nothing
+ }
}
}
diff --git a/src/main/java/net/citizensnpcs/api/util/Translator.java b/src/main/java/net/citizensnpcs/api/util/Translator.java
index 1eef0f51..05298df3 100644
--- a/src/main/java/net/citizensnpcs/api/util/Translator.java
+++ b/src/main/java/net/citizensnpcs/api/util/Translator.java
@@ -204,7 +204,14 @@ private static void addTranslation(TranslationProvider from, File to) {
} catch (IOException e) {
e.printStackTrace();
} finally {
- Closeables.closeQuietly(out);
+ try {
+ if (out != null) {
+ out.close();
+ }
+ }
+ catch (Exception e) {
+ e.getCause(); // Do nothing
+ }
}
}
@@ -291,7 +298,14 @@ private static void populateDefaults(File bundleFile) {
} catch (Exception e) {
e.printStackTrace();
} finally {
- Closeables.closeQuietly(stream);
+ try {
+ if (stream != null) {
+ stream.close();
+ }
+ }
+ catch (Exception e) {
+ e.getCause(); // Do nothing
+ }
}
}
diff --git a/src/test/java/net/citizensnpcs/api/ai/BehaviorTreeTest.java b/src/test/java/net/citizensnpcs/api/ai/BehaviorTreeTest.java
index 190c8f35..151425f3 100644
--- a/src/test/java/net/citizensnpcs/api/ai/BehaviorTreeTest.java
+++ b/src/test/java/net/citizensnpcs/api/ai/BehaviorTreeTest.java
@@ -5,8 +5,6 @@
import java.util.List;
-import javax.annotation.Nullable;
-
import net.citizensnpcs.api.ai.tree.Behavior;
import net.citizensnpcs.api.ai.tree.BehaviorGoalAdapter;
import net.citizensnpcs.api.ai.tree.BehaviorStatus;
@@ -31,7 +29,7 @@ public void failureSelector() {
int idx;
@Override
- public Behavior apply(@Nullable List input) {
+ public Behavior apply(List input) {
Behavior b = input.get(idx++);
if (idx >= input.size())
idx = 0;