From 0cd09b22fe82825c5b9fc02e3a2e82e739be1bea Mon Sep 17 00:00:00 2001 From: ar0n Date: Sun, 9 May 2021 17:38:23 +0100 Subject: [PATCH 1/2] Center of block + cleanup Play sound from centre of Jukebox instead of corner. Code cleanup / optimisations. --- pom.xml | 8 ++++---- src/main/java/me/tajam/jext/JextNamespace.java | 4 ++-- src/main/java/me/tajam/jext/Log.java | 18 +++++++++--------- src/main/java/me/tajam/jext/SpigotVersion.java | 2 +- .../tajam/jext/command/ExecutorDiscGive.java | 2 +- .../tajam/jext/command/ExecutorStopMusic.java | 2 +- .../me/tajam/jext/command/LocationParser.java | 8 ++++---- .../tajam/jext/command/ParameterLocation.java | 14 +++++++------- .../me/tajam/jext/command/PlayerSelector.java | 4 ++-- .../me/tajam/jext/config/ConfigDiscData.java | 10 +++++----- .../tajam/jext/config/field/ConfigField.java | 2 +- .../jext/config/field/ConfigFieldList.java | 6 +++--- .../config/field/ConfigFieldListString.java | 2 +- .../jext/configuration/ConfigFieldObject.java | 6 +++--- .../tajam/jext/configuration/ConfigFile.java | 4 ++-- .../jext/configuration/ConfigSection.java | 2 +- .../jext/configuration/ConfigYmlvLatest.java | 10 +++------- .../jext/configuration/ConfigYmlvLegacy.java | 10 +++------- .../tajam/jext/configuration/Configurable.java | 4 ++-- .../jext/configuration/Configuration.java | 2 +- .../configuration/ReflectionConfigMap.java | 4 ++-- .../java/me/tajam/jext/disc/DiscContainer.java | 12 ++++++------ .../jext/disc/DiscPersistentDataContainer.java | 2 +- .../java/me/tajam/jext/disc/DiscPlayer.java | 3 ++- .../jext/listener/CreeperDeathListener.java | 4 ++-- .../jext/listener/RecordPacketListener.java | 2 +- .../jext/listener/ResourceStatusListener.java | 2 +- 27 files changed, 71 insertions(+), 78 deletions(-) diff --git a/pom.xml b/pom.xml index cd8b1bc8..abec34f8 100644 --- a/pom.xml +++ b/pom.xml @@ -11,8 +11,8 @@ UTF-8 - 1.8 - 1.8 + 11 + 11 @@ -34,13 +34,13 @@ org.spigotmc spigot-api - 1.16.3-R0.1-SNAPSHOT + 1.16.5-R0.1-SNAPSHOT provided com.comphenix.protocol ProtocolLib - 4.5.0 + 4.6.0 provided diff --git a/src/main/java/me/tajam/jext/JextNamespace.java b/src/main/java/me/tajam/jext/JextNamespace.java index d880a928..47593303 100644 --- a/src/main/java/me/tajam/jext/JextNamespace.java +++ b/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; } diff --git a/src/main/java/me/tajam/jext/Log.java b/src/main/java/me/tajam/jext/Log.java index 04f6d381..9fab3fd2 100644 --- a/src/main/java/me/tajam/jext/Log.java +++ b/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 tokens; + private final List tokens; public Log(String title) { this.tokens = new ArrayList<>(); @@ -383,18 +383,18 @@ public String text(Object... objects) { } private String constructMessage(Queue 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; diff --git a/src/main/java/me/tajam/jext/SpigotVersion.java b/src/main/java/me/tajam/jext/SpigotVersion.java index b2f5ad4b..419e461f 100644 --- a/src/main/java/me/tajam/jext/SpigotVersion.java +++ b/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); diff --git a/src/main/java/me/tajam/jext/command/ExecutorDiscGive.java b/src/main/java/me/tajam/jext/command/ExecutorDiscGive.java index ef247550..83175c91 100644 --- a/src/main/java/me/tajam/jext/command/ExecutorDiscGive.java +++ b/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) { diff --git a/src/main/java/me/tajam/jext/command/ExecutorStopMusic.java b/src/main/java/me/tajam/jext/command/ExecutorStopMusic.java index 050d4c17..5a7c99b5 100644 --- a/src/main/java/me/tajam/jext/command/ExecutorStopMusic.java +++ b/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) { diff --git a/src/main/java/me/tajam/jext/command/LocationParser.java b/src/main/java/me/tajam/jext/command/LocationParser.java index c794bf20..e34b50c0 100644 --- a/src/main/java/me/tajam/jext/command/LocationParser.java +++ b/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; diff --git a/src/main/java/me/tajam/jext/command/ParameterLocation.java b/src/main/java/me/tajam/jext/command/ParameterLocation.java index 4eeb61bc..de092835 100644 --- a/src/main/java/me/tajam/jext/command/ParameterLocation.java +++ b/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 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: diff --git a/src/main/java/me/tajam/jext/command/PlayerSelector.java b/src/main/java/me/tajam/jext/command/PlayerSelector.java index eef1c4a5..a0cc0644 100644 --- a/src/main/java/me/tajam/jext/command/PlayerSelector.java +++ b/src/main/java/me/tajam/jext/command/PlayerSelector.java @@ -38,9 +38,9 @@ static Set 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; diff --git a/src/main/java/me/tajam/jext/config/ConfigDiscData.java b/src/main/java/me/tajam/jext/config/ConfigDiscData.java index 38393ef6..abc0acaa 100644 --- a/src/main/java/me/tajam/jext/config/ConfigDiscData.java +++ b/src/main/java/me/tajam/jext/config/ConfigDiscData.java @@ -20,11 +20,11 @@ public enum Path { } - private String name; - private HashMap> stringMap; - private HashMap> integerMap; - private HashMap> booleanMap; - private ConfigFieldListString lores; + private final String name; + private final HashMap> stringMap; + private final HashMap> integerMap; + private final HashMap> booleanMap; + private final ConfigFieldListString lores; public ConfigDiscData(String name) { diff --git a/src/main/java/me/tajam/jext/config/field/ConfigField.java b/src/main/java/me/tajam/jext/config/field/ConfigField.java index 5535de74..3ed26895 100644 --- a/src/main/java/me/tajam/jext/config/field/ConfigField.java +++ b/src/main/java/me/tajam/jext/config/field/ConfigField.java @@ -6,7 +6,7 @@ public class ConfigField { - private String path; + private final String path; private T data; public ConfigField(String path, T defaultData) { diff --git a/src/main/java/me/tajam/jext/config/field/ConfigFieldList.java b/src/main/java/me/tajam/jext/config/field/ConfigFieldList.java index e79e89e6..d8b048bb 100644 --- a/src/main/java/me/tajam/jext/config/field/ConfigFieldList.java +++ b/src/main/java/me/tajam/jext/config/field/ConfigFieldList.java @@ -6,8 +6,8 @@ public interface ConfigFieldList { - public String getPath(); - public ArrayList getData(); - public void updateData(ConfigurationSection section); + String getPath(); + ArrayList getData(); + void updateData(ConfigurationSection section); } \ No newline at end of file diff --git a/src/main/java/me/tajam/jext/config/field/ConfigFieldListString.java b/src/main/java/me/tajam/jext/config/field/ConfigFieldListString.java index 4a1c408a..836c73f0 100644 --- a/src/main/java/me/tajam/jext/config/field/ConfigFieldListString.java +++ b/src/main/java/me/tajam/jext/config/field/ConfigFieldListString.java @@ -8,7 +8,7 @@ public class ConfigFieldListString implements ConfigFieldList { - private String path; + private final String path; private ArrayList data; public ConfigFieldListString(String path, ArrayList defaultData) { diff --git a/src/main/java/me/tajam/jext/configuration/ConfigFieldObject.java b/src/main/java/me/tajam/jext/configuration/ConfigFieldObject.java index b0ffeb32..2a337e8a 100644 --- a/src/main/java/me/tajam/jext/configuration/ConfigFieldObject.java +++ b/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); diff --git a/src/main/java/me/tajam/jext/configuration/ConfigFile.java b/src/main/java/me/tajam/jext/configuration/ConfigFile.java index 50479d95..ca4dc4c3 100644 --- a/src/main/java/me/tajam/jext/configuration/ConfigFile.java +++ b/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)) { diff --git a/src/main/java/me/tajam/jext/configuration/ConfigSection.java b/src/main/java/me/tajam/jext/configuration/ConfigSection.java index 1d467347..2e0dda03 100644 --- a/src/main/java/me/tajam/jext/configuration/ConfigSection.java +++ b/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); diff --git a/src/main/java/me/tajam/jext/configuration/ConfigYmlvLatest.java b/src/main/java/me/tajam/jext/configuration/ConfigYmlvLatest.java index a818d43c..26d9e129 100644 --- a/src/main/java/me/tajam/jext/configuration/ConfigYmlvLatest.java +++ b/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"; diff --git a/src/main/java/me/tajam/jext/configuration/ConfigYmlvLegacy.java b/src/main/java/me/tajam/jext/configuration/ConfigYmlvLegacy.java index 61edf8df..a548a234 100644 --- a/src/main/java/me/tajam/jext/configuration/ConfigYmlvLegacy.java +++ b/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"; diff --git a/src/main/java/me/tajam/jext/configuration/Configurable.java b/src/main/java/me/tajam/jext/configuration/Configurable.java index 8ae27463..b4624a0d 100644 --- a/src/main/java/me/tajam/jext/configuration/Configurable.java +++ b/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(); } diff --git a/src/main/java/me/tajam/jext/configuration/Configuration.java b/src/main/java/me/tajam/jext/configuration/Configuration.java index ff4baca4..40356b50 100644 --- a/src/main/java/me/tajam/jext/configuration/Configuration.java +++ b/src/main/java/me/tajam/jext/configuration/Configuration.java @@ -7,7 +7,7 @@ public abstract class Configuration implements Configurable { private Configuration parent; - private List childs; + private final List childs; private int level; public Configuration() { diff --git a/src/main/java/me/tajam/jext/configuration/ReflectionConfigMap.java b/src/main/java/me/tajam/jext/configuration/ReflectionConfigMap.java index 7bd94119..c952f0d7 100644 --- a/src/main/java/me/tajam/jext/configuration/ReflectionConfigMap.java +++ b/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; diff --git a/src/main/java/me/tajam/jext/disc/DiscContainer.java b/src/main/java/me/tajam/jext/disc/DiscContainer.java index d779d71f..22e09fba 100644 --- a/src/main/java/me/tajam/jext/disc/DiscContainer.java +++ b/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 lores; - private Material material; + private final ArrayList lores; + private final Material material; public DiscContainer(ConfigDiscData configDiscData) { this.title = configDiscData.getName(); diff --git a/src/main/java/me/tajam/jext/disc/DiscPersistentDataContainer.java b/src/main/java/me/tajam/jext/disc/DiscPersistentDataContainer.java index 90ff6af4..a9064bab 100644 --- a/src/main/java/me/tajam/jext/disc/DiscPersistentDataContainer.java +++ b/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(); diff --git a/src/main/java/me/tajam/jext/disc/DiscPlayer.java b/src/main/java/me/tajam/jext/disc/DiscPlayer.java index ab4a9e0c..2b51fef4 100644 --- a/src/main/java/me/tajam/jext/disc/DiscPlayer.java +++ b/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)) { diff --git a/src/main/java/me/tajam/jext/listener/CreeperDeathListener.java b/src/main/java/me/tajam/jext/listener/CreeperDeathListener.java index f9d6cea9..a44eea38 100644 --- a/src/main/java/me/tajam/jext/listener/CreeperDeathListener.java +++ b/src/main/java/me/tajam/jext/listener/CreeperDeathListener.java @@ -17,8 +17,8 @@ public class CreeperDeathListener implements Listener { - private List droppableDiscs = new ArrayList<>(); - private Random generator = new Random(); + private final List droppableDiscs = new ArrayList<>(); + private final Random generator = new Random(); public CreeperDeathListener() { final ConfigDiscManager configDiscManager = ConfigDiscManager.getInstance(); diff --git a/src/main/java/me/tajam/jext/listener/RecordPacketListener.java b/src/main/java/me/tajam/jext/listener/RecordPacketListener.java index b26b27e0..f2a2166a 100644 --- a/src/main/java/me/tajam/jext/listener/RecordPacketListener.java +++ b/src/main/java/me/tajam/jext/listener/RecordPacketListener.java @@ -32,7 +32,7 @@ class RecordPacketListener extends PacketAdapter { public RecordPacketListener(Plugin plugin, ListenerPriority priority) { - super(plugin, priority, new PacketType[] { PacketType.Play.Server.WORLD_EVENT }); + super(plugin, priority, PacketType.Play.Server.WORLD_EVENT); } @Override diff --git a/src/main/java/me/tajam/jext/listener/ResourceStatusListener.java b/src/main/java/me/tajam/jext/listener/ResourceStatusListener.java index 8ad2cdfc..88ef72bb 100644 --- a/src/main/java/me/tajam/jext/listener/ResourceStatusListener.java +++ b/src/main/java/me/tajam/jext/listener/ResourceStatusListener.java @@ -12,7 +12,7 @@ class ResourceStatusListener implements Listener { - private JavaPlugin plugin; + private final JavaPlugin plugin; public ResourceStatusListener(JavaPlugin plugin) { this.plugin = plugin; From 0e1be2a711873bc7c8fec08aa1666e4be4130c10 Mon Sep 17 00:00:00 2001 From: ar0n Date: Sun, 9 May 2021 18:59:55 +0100 Subject: [PATCH 2/2] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index abec34f8..00dbea6c 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ junit junit - 4.11 + 4.13.2 test