Center of block + cleanup

pom.xml

@@ -11,8 +11,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
   </properties>
 
   <repositories>
@@ -34,13 +34,13 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.16.3-R0.1-SNAPSHOT</version>
+      <version>1.16.5-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.comphenix.protocol</groupId>
       <artifactId>ProtocolLib</artifactId>
-      <version>4.5.0</version>
+      <version>4.6.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.13.2</version>
       <scope>test</scope>
       </dependency>
   </dependencies>

src/main/java/me/tajam/jext/JextNamespace.java

@@ -18,10 +18,10 @@ public static void registerNamespace(JavaPlugin plugin) {
     }
   }
 
-  private String key;
+  private final String key;
   private NamespacedKey namespacedKey;
 
-  private JextNamespace(String key) {
+  JextNamespace(String key) {
     this.key = key;
     this.namespacedKey = null;
   }

src/main/java/me/tajam/jext/Log.java

@@ -13,9 +13,9 @@
 
 public class Log {
 
-  private String title;
+  private final String title;
   private ChatColor themeColor;
-  private List<Token> tokens;
+  private final List<Token> tokens;
 
   public Log(String title) {
     this.tokens = new ArrayList<>();
@@ -383,18 +383,18 @@ public String text(Object... objects) {
   }
 
   private String constructMessage(Queue<Object> parameters) {
-    String message = "";
+    StringBuilder message = new StringBuilder();
     for (Token token : tokens) {
-      message += token.toString(parameters);
+      message.append(token.toString(parameters));
     }
-    return message;
+    return message.toString();
   }
 
-  private class Token {
+  private static class Token {
 
-    private String message;
-    private ChatColor color;
-    private boolean parameter;
+    private final String message;
+    private final ChatColor color;
+    private final boolean parameter;
 
     private Token(String message, ChatColor color, boolean parameter) {
       this.message = message;

src/main/java/me/tajam/jext/SpigotVersion.java

@@ -6,7 +6,7 @@ public class SpigotVersion {
 
   private static SpigotVersion instance;
 
-  private String version;
+  private final String version;
 
   public SpigotVersion(JavaPlugin plugin) {
     this.version = plugin.getServer().getBukkitVersion().substring(0, 4);

src/main/java/me/tajam/jext/command/ExecutorDiscGive.java

@@ -42,7 +42,7 @@ private boolean mergedExecute(CommandSender sender, String[] args) {
       new Log().info().t("Received ").p().t(" disc.").send(player, disc);
     }
 
-    final Integer playerCount = players.size();
+    final int playerCount = players.size();
     if (playerCount >= 2) {
       new Log().warn().t("Given ").o().t(" disc to ").o().t(" players!").send(sender, disc, playerCount);
     } else if (playerCount == 1) {

src/main/java/me/tajam/jext/command/ExecutorStopMusic.java

@@ -59,7 +59,7 @@ boolean mergedExecute(CommandSender sender, String[] args) {
         new Log().info().t("Stopped all music.").send(player);
     }
 
-    final Integer playerCount = players.size();
+    final int playerCount = players.size();
     if (playerCount >= 2) {
       new Log().warn().t("Stopped music for ").o().t(" players!").send(sender, playerCount);
     } else if (playerCount == 1) {

src/main/java/me/tajam/jext/command/LocationParser.java

@@ -5,10 +5,10 @@
 
 public class LocationParser {
 
-  private String stringX;
-  private String stringY;
-  private String stringZ;
-  private Player sender;
+  private final String stringX;
+  private final String stringY;
+  private final String stringZ;
+  private final Player sender;
 
   public LocationParser(String stringX, String stringY, String stringZ, Player sender) throws IllegalStateException {
     this.stringX = stringX;

src/main/java/me/tajam/jext/command/ParameterLocation.java

@@ -14,7 +14,7 @@ enum Axis {
     X, Y, Z
   }
 
-  private Axis axis;
+  private final Axis axis;
 
   ParameterLocation(boolean required, Axis axis) {
     super(required);
@@ -37,18 +37,18 @@ List<String> onComplete(String parameter, CommandSender sender) {
     final Location location = block.getLocation();
     switch(axis) {
       case X: {
-        Integer a = location.getBlockX();
-        suggestions.add(a.toString());
+        int a = location.getBlockX();
+        suggestions.add(Integer.toString(a));
         break;
       }
       case Y: {
-        Integer a = location.getBlockY();
-        suggestions.add(a.toString());
+        int a = location.getBlockY();
+        suggestions.add(Integer.toString(a));
         break;
       }
       case Z: {
-        Integer a = location.getBlockZ();
-        suggestions.add(a.toString());
+        int a = location.getBlockZ();
+        suggestions.add(Integer.toString(a));
         break;
       }
       default:

src/main/java/me/tajam/jext/command/PlayerSelector.java

@@ -38,9 +38,9 @@ static Set<String> getSelectorStrings() {
     return SELECTOR_SYMBOL_MAP.keySet();
   }
 
-  private CommandSender sender;
+  private final CommandSender sender;
   private Selector mode;
-  private String selector;
+  private final String selector;
 
   PlayerSelector(CommandSender sender, String selector) {
     this.sender = sender;

src/main/java/me/tajam/jext/config/ConfigDiscData.java

@@ -20,11 +20,11 @@ public enum Path {
 
   }
 
-  private String name;
-  private HashMap<Path, ConfigField<String>> stringMap;
-  private HashMap<Path, ConfigField<Integer>> integerMap;
-  private HashMap<Path, ConfigField<Boolean>> booleanMap;
-  private ConfigFieldListString lores;
+  private final String name;
+  private final HashMap<Path, ConfigField<String>> stringMap;
+  private final HashMap<Path, ConfigField<Integer>> integerMap;
+  private final HashMap<Path, ConfigField<Boolean>> booleanMap;
+  private final ConfigFieldListString lores;
 
   public ConfigDiscData(String name) {
 

src/main/java/me/tajam/jext/config/field/ConfigField.java

@@ -6,7 +6,7 @@
 
 public class ConfigField<T> {
 
-  private String path;
+  private final String path;
   private T data;
 
   public ConfigField(String path, T defaultData) {

src/main/java/me/tajam/jext/config/field/ConfigFieldList.java

@@ -6,8 +6,8 @@
 
 public interface ConfigFieldList<T> {
 
-  public String getPath();
-  public ArrayList<T> getData();
-  public void updateData(ConfigurationSection section);
+  String getPath();
+  ArrayList<T> getData();
+  void updateData(ConfigurationSection section);
 
 }

src/main/java/me/tajam/jext/config/field/ConfigFieldListString.java

@@ -8,7 +8,7 @@
 
 public class ConfigFieldListString implements ConfigFieldList<String> {
 
-  private String path;
+  private final String path;
   private ArrayList<String> data;
 
   public ConfigFieldListString(String path, ArrayList<String> defaultData) {

src/main/java/me/tajam/jext/configuration/ConfigFieldObject.java

@@ -9,9 +9,9 @@
 
 public class ConfigFieldObject extends ConfigField {
 
-  private ReflectionConfigMap configMap;
-  private ConfigurationSection section;
-  private String fieldName;
+  private final ReflectionConfigMap configMap;
+  private final ConfigurationSection section;
+  private final String fieldName;
 
   public ConfigFieldObject(Field field, ConfigurationSection section, Object instance) {
     super(field, section, instance);

src/main/java/me/tajam/jext/configuration/ConfigFile.java

@@ -10,8 +10,8 @@
 
 public class ConfigFile extends Configuration {
 
-  private File file;
-  private ConfigSection mainSection;
+  private final File file;
+  private final ConfigSection mainSection;
 
   public ConfigFile(Class<?> clazz, JavaPlugin plugin) throws InvalidClassException {
     if (!clazz.isAnnotationPresent(MarkAsConfigFile.class)) {

src/main/java/me/tajam/jext/configuration/ConfigSection.java

@@ -12,7 +12,7 @@
 
 public class ConfigSection extends Configuration {
 
-  private Class<?> clazz;
+  private final Class<?> clazz;
 
   public ConfigSection(Class<?> clazz, ConfigurationSection section) {
     this(clazz, section, null);

src/main/java/me/tajam/jext/configuration/ConfigYmlvLatest.java

@@ -1,10 +1,6 @@
 package me.tajam.jext.configuration;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import me.tajam.jext.configuration.ConfigUtil.*;
 
@@ -45,14 +41,14 @@ public static class SETTINGS {
     DiscData disc_0 = new DiscData();
     disc_0.AUTHOR = "C148";
     disc_0.CREEPER_DROP = true;
-    disc_0.LORE = Arrays.asList("Minecraft originals");
+    disc_0.LORE = Collections.singletonList("Minecraft originals");
     disc_0.MODEL_DATA = 0;
     disc_0.TITLE = "Cat";
 
     DiscData disc_1 = new DiscData();
     disc_1.AUTHOR = "C148";
     disc_1.CREEPER_DROP = true;
-    disc_1.LORE = Arrays.asList("Minecraft originals");
+    disc_1.LORE = Collections.singletonList("Minecraft originals");
     disc_1.MODEL_DATA = 0;
     disc_1.TITLE = "Stal";
 

src/main/java/me/tajam/jext/configuration/ConfigYmlvLegacy.java

@@ -1,10 +1,6 @@
 package me.tajam.jext.configuration;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import me.tajam.jext.configuration.ConfigUtil.*;
 
@@ -25,14 +21,14 @@ public static class Jext {
       DiscData disc_0 = new DiscData();
       disc_0.AUTHOR = "C148";
       disc_0.CREEPER_DROP = true;
-      disc_0.LORE = Arrays.asList("Minecraft originals");
+      disc_0.LORE = Collections.singletonList("Minecraft originals");
       disc_0.MODEL_DATA = 0;
       disc_0.NAMESPACE= "music_disc.cat";
 
       DiscData disc_1 = new DiscData();
       disc_1.AUTHOR = "C148";
       disc_1.CREEPER_DROP = true;
-      disc_1.LORE = Arrays.asList("Minecraft originals");
+      disc_1.LORE = Collections.singletonList("Minecraft originals");
       disc_1.MODEL_DATA = 0;
       disc_1.NAMESPACE = "music_disc.stal";
 

src/main/java/me/tajam/jext/configuration/Configurable.java

@@ -2,8 +2,8 @@
 
 public interface Configurable {
 
-  public void save(ConfigWriter writer);
+  void save(ConfigWriter writer);
 
-  public void load();
+  void load();
 
 }

src/main/java/me/tajam/jext/configuration/Configuration.java

@@ -7,7 +7,7 @@
 public abstract class Configuration implements Configurable {
 
   private Configuration parent;
-  private List<Configurable> childs;
+  private final List<Configurable> childs;
   private int level;
 
   public Configuration() {

src/main/java/me/tajam/jext/configuration/ReflectionConfigMap.java

@@ -18,8 +18,8 @@
 
 public class ReflectionConfigMap {
 
-  private Field mapField;
-  private Object instance;
+  private final Field mapField;
+  private final Object instance;
   private Class<?> keyClass;
   private Class<?> valueClass;
 

src/main/java/me/tajam/jext/disc/DiscContainer.java

@@ -36,13 +36,13 @@ public class DiscContainer {
   }
   public static final Material BASEDISC_MATERIAL = Material.MUSIC_DISC_11;
 
-  private String title;
-  private String author;
-  private String namespaceID;
-  private int customModelData;
+  private final String title;
+  private final String author;
+  private final String namespaceID;
+  private final int customModelData;
   private boolean creeperDrop;
-  private ArrayList<String> lores;
-  private Material material;
+  private final ArrayList<String> lores;
+  private final Material material;
 
   public DiscContainer(ConfigDiscData configDiscData) {
     this.title = configDiscData.getName();

src/main/java/me/tajam/jext/disc/DiscPersistentDataContainer.java

@@ -10,7 +10,7 @@ public class DiscPersistentDataContainer {
 
   private final String IDENTIFIER = "JEXT";
 
-  private PersistentDataContainer container;
+  private final PersistentDataContainer container;
 
   public DiscPersistentDataContainer(ItemMeta meta) {
     this.container = meta.getPersistentDataContainer();

src/main/java/me/tajam/jext/disc/DiscPlayer.java

@@ -13,7 +13,7 @@ public class DiscPlayer {
   private static final double JUKEBOX_RANGE_MULTIPLY = 16.0;
   private static final float JUKEBOX_VOLUME = 4.0f;
 
-  private String namespace;
+  private final String namespace;
   private float volume;
   private float pitch;
 
@@ -38,6 +38,7 @@ public DiscPlayer setPitch(float value) {
   }
 
   public void play(Location location) {
+    location = location.add(0.5, 0.5, 0.5);
     World world = location.getWorld();
     ConfigManager manager = ConfigManager.getInstance();
     if (!manager.getBooleanData(ConfigData.BooleanData.Path.ALLOW_OVERLAP)) {