From 3fbd10e0789079f8720729ad2c3060c82908762b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=80=A0=E6=83=B0?= Date: Sun, 16 Feb 2020 06:13:19 +0900 Subject: [PATCH] Code improvement and dependency update. (#106) * [Change] pom indent to 2 spaces. * [Update] dependencies (Essentials and ProtocolLib) * [Change] "new Integer(s)" to "Integer.parseInt(s)" * [Change] indent (from space to tab) --- Common/pom.xml | 64 ++--- Spigot-1_14/pom.xml | 144 +++++----- Spigot/pom.xml | 266 +++++++++--------- WG/pom.xml | 126 ++++----- .../flags/helpers/SoundDataFlag.java | 4 +- WG6/pom.xml | 106 +++---- WG7/pom.xml | 118 ++++---- 7 files changed, 414 insertions(+), 414 deletions(-) diff --git a/Common/pom.xml b/Common/pom.xml index 645660c..cf91ea3 100644 --- a/Common/pom.xml +++ b/Common/pom.xml @@ -1,34 +1,34 @@ - 4.0.0 - - net.goldtreeservers - worldguardextraflags - 4.1.4-DEV - - - net.goldtreeservers.worldguardextraflags - common - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - - - - net.goldtreeservers.worldguardextraflags - wg - ${project.version} - compile - - - - org.spigotmc - spigot-api - 1.13-R0.1-SNAPSHOT - provided - - + 4.0.0 + + net.goldtreeservers + worldguardextraflags + 4.1.4-DEV + + + net.goldtreeservers.worldguardextraflags + common + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + + + net.goldtreeservers.worldguardextraflags + wg + ${project.version} + compile + + + + org.spigotmc + spigot-api + 1.13-R0.1-SNAPSHOT + provided + + \ No newline at end of file diff --git a/Spigot-1_14/pom.xml b/Spigot-1_14/pom.xml index 00ae840..fad86cb 100644 --- a/Spigot-1_14/pom.xml +++ b/Spigot-1_14/pom.xml @@ -1,74 +1,74 @@ - 4.0.0 - - net.goldtreeservers - worldguardextraflags - 4.1.4-DEV - - - net.goldtreeservers.worldguardextraflags - spigot-1_14 - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - sk89q-repo - https://maven.sk89q.com/repo/ - - - ess-repo - http://repo.ess3.net/content/groups/essentials - - - empcraft - http://ci.athion.net/job/FastAsyncWorldEdit/ws/mvn/ - - - dmulloy2-repo - http://repo.dmulloy2.net/nexus/repository/public/ - - - - - - net.goldtreeservers.worldguardextraflags - wg - ${project.version} - provided - - - net.goldtreeservers.worldguardextraflags - wg6 - ${project.version} - provided - - - net.goldtreeservers.worldguardextraflags - wg7 - ${project.version} - provided - - - net.goldtreeservers.worldguardextraflags - common - ${project.version} - provided - - - - org.spigotmc - spigot-api - 1.14.4-R0.1-SNAPSHOT - provided - - - com.sk89q.worldguard - worldguard-legacy - 7.0.0-SNAPSHOT - provided - - + 4.0.0 + + net.goldtreeservers + worldguardextraflags + 4.1.4-DEV + + + net.goldtreeservers.worldguardextraflags + spigot-1_14 + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + sk89q-repo + https://maven.sk89q.com/repo/ + + + ess-repo + http://repo.ess3.net/content/groups/essentials + + + empcraft + http://ci.athion.net/job/FastAsyncWorldEdit/ws/mvn/ + + + dmulloy2-repo + http://repo.dmulloy2.net/nexus/repository/public/ + + + + + + net.goldtreeservers.worldguardextraflags + wg + ${project.version} + provided + + + net.goldtreeservers.worldguardextraflags + wg6 + ${project.version} + provided + + + net.goldtreeservers.worldguardextraflags + wg7 + ${project.version} + provided + + + net.goldtreeservers.worldguardextraflags + common + ${project.version} + provided + + + + org.spigotmc + spigot-api + 1.14.4-R0.1-SNAPSHOT + provided + + + com.sk89q.worldguard + worldguard-legacy + 7.0.0-SNAPSHOT + provided + + \ No newline at end of file diff --git a/Spigot/pom.xml b/Spigot/pom.xml index d02f577..d463a7d 100644 --- a/Spigot/pom.xml +++ b/Spigot/pom.xml @@ -1,135 +1,135 @@ - 4.0.0 - - net.goldtreeservers - worldguardextraflags - 4.1.4-DEV - - - net.goldtreeservers.worldguardextraflags - Spigot - - - WorldGuardExtraFlags - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.0 - - - package - - shade - - - - - - - *:* - - **/*.java - **/*.SF - **/*.DSA - - - - - - - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - sk89q-repo - https://maven.sk89q.com/repo/ - - - ess-repo - http://repo.ess3.net/content/groups/essentials - - - empcraft - http://ci.athion.net/job/FastAsyncWorldEdit/ws/mvn/ - - - dmulloy2-repo - http://repo.dmulloy2.net/nexus/repository/public/ - - - - - - net.goldtreeservers.worldguardextraflags - common - ${project.version} - compile - - - net.goldtreeservers.worldguardextraflags - wg - ${project.version} - compile - - - net.goldtreeservers.worldguardextraflags - wg6 - ${project.version} - compile - - - net.goldtreeservers.worldguardextraflags - wg7 - ${project.version} - compile - - - net.goldtreeservers.worldguardextraflags - spigot-1_14 - ${project.version} - compile - - - - org.spigotmc - spigot-api - 1.13-R0.1-SNAPSHOT - provided - - - com.sk89q.worldedit - worldedit-bukkit - 7.0.0-SNAPSHOT - provided - - - com.sk89q.worldguard - worldguard-legacy - 7.0.0-SNAPSHOT - provided - - - net.ess3 - Essentials - 2.13-SNAPSHOT - provided - - - com.boydti - fawe-api - 18.07.27-3ed2e57-1163-20.5.2 - provided - - - com.comphenix.protocol - ProtocolLib-API - 4.4.0 - provided - - + 4.0.0 + + net.goldtreeservers + worldguardextraflags + 4.1.4-DEV + + + net.goldtreeservers.worldguardextraflags + Spigot + + + WorldGuardExtraFlags + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.0 + + + package + + shade + + + + + + + *:* + + **/*.java + **/*.SF + **/*.DSA + + + + + + + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + sk89q-repo + https://maven.sk89q.com/repo/ + + + essentialsx-repo + https://ci.ender.zone/plugin/repository/everything/ + + + empcraft + http://ci.athion.net/job/FastAsyncWorldEdit/ws/mvn/ + + + dmulloy2-repo + http://repo.dmulloy2.net/nexus/repository/public/ + + + + + + net.goldtreeservers.worldguardextraflags + common + ${project.version} + compile + + + net.goldtreeservers.worldguardextraflags + wg + ${project.version} + compile + + + net.goldtreeservers.worldguardextraflags + wg6 + ${project.version} + compile + + + net.goldtreeservers.worldguardextraflags + wg7 + ${project.version} + compile + + + net.goldtreeservers.worldguardextraflags + spigot-1_14 + ${project.version} + compile + + + + org.spigotmc + spigot-api + 1.13-R0.1-SNAPSHOT + provided + + + com.sk89q.worldedit + worldedit-bukkit + 7.0.0-SNAPSHOT + provided + + + com.sk89q.worldguard + worldguard-legacy + 7.0.0-SNAPSHOT + provided + + + net.ess3 + EssentialsX + 2.17.0 + provided + + + com.boydti + fawe-api + 18.07.27-3ed2e57-1163-20.5.2 + provided + + + com.comphenix.protocol + ProtocolLib + 4.5.0 + provided + + \ No newline at end of file diff --git a/WG/pom.xml b/WG/pom.xml index 7920d22..e6ed0e4 100644 --- a/WG/pom.xml +++ b/WG/pom.xml @@ -1,65 +1,65 @@ - 4.0.0 - - net.goldtreeservers - worldguardextraflags - 4.1.4-DEV - - - net.goldtreeservers.worldguardextraflags - wg - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - sk89q-repo - https://maven.sk89q.com/repo/ - - - ess-repo - http://repo.ess3.net/content/groups/essentials - - - - - - org.spigotmc - spigot-api - 1.13-R0.1-SNAPSHOT - provided - - - com.sk89q.worldedit - worldedit-core - 7.0.0-SNAPSHOT - provided - - - com.sk89q.worldedit - worldedit-bukkit - 7.0.0-SNAPSHOT - provided - - - com.sk89q.worldguard - worldguard-core - 7.0.0-SNAPSHOT - provided - - - com.sk89q.worldguard - worldguard-legacy - 7.0.0-SNAPSHOT - provided - - - net.ess3 - Essentials - 2.13-SNAPSHOT - provided - - + 4.0.0 + + net.goldtreeservers + worldguardextraflags + 4.1.4-DEV + + + net.goldtreeservers.worldguardextraflags + wg + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + sk89q-repo + https://maven.sk89q.com/repo/ + + + essentialsx-repo + https://ci.ender.zone/plugin/repository/everything/ + + + + + + org.spigotmc + spigot-api + 1.13-R0.1-SNAPSHOT + provided + + + com.sk89q.worldedit + worldedit-core + 7.0.0-SNAPSHOT + provided + + + com.sk89q.worldedit + worldedit-bukkit + 7.0.0-SNAPSHOT + provided + + + com.sk89q.worldguard + worldguard-core + 7.0.0-SNAPSHOT + provided + + + com.sk89q.worldguard + worldguard-legacy + 7.0.0-SNAPSHOT + provided + + + net.ess3 + EssentialsX + 2.17.0 + provided + + \ No newline at end of file diff --git a/WG/src/main/java/net/goldtreeservers/worldguardextraflags/flags/helpers/SoundDataFlag.java b/WG/src/main/java/net/goldtreeservers/worldguardextraflags/flags/helpers/SoundDataFlag.java index 6e64fb9..39fa849 100644 --- a/WG/src/main/java/net/goldtreeservers/worldguardextraflags/flags/helpers/SoundDataFlag.java +++ b/WG/src/main/java/net/goldtreeservers/worldguardextraflags/flags/helpers/SoundDataFlag.java @@ -25,7 +25,7 @@ public class SoundDataFlag extends Flag String[] splitd = context.getUserInput().trim().split(" "); if (splitd.length == 2) { - return new SoundData(splitd[0], new Integer(splitd[1])); + return new SoundData(splitd[0], Integer.parseInt(splitd[1])); } else { @@ -37,6 +37,6 @@ public class SoundDataFlag extends Flag public SoundData unmarshal(Object o) { String[] splitd = o.toString().split(" "); - return new SoundData(splitd[0], new Integer(splitd[1])); + return new SoundData(splitd[0], Integer.parseInt(splitd[1])); } } diff --git a/WG6/pom.xml b/WG6/pom.xml index 88561a5..df1e0cf 100644 --- a/WG6/pom.xml +++ b/WG6/pom.xml @@ -1,55 +1,55 @@ - 4.0.0 - - net.goldtreeservers - worldguardextraflags - 4.1.4-DEV - - - net.goldtreeservers.worldguardextraflags - wg6 - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - sk89q-repo - https://maven.sk89q.com/repo/ - - - - - - net.goldtreeservers.worldguardextraflags - wg - ${project.version} - provided - - - org.spigotmc - spigot-api - 1.13-R0.1-SNAPSHOT - provided - - - com.sk89q - guavabackport - 1.2 - provided - - - com.sk89q.worldedit - worldedit-bukkit - 6.1.3-SNAPSHOT - provided - - - com.sk89q.worldguard - worldguard-legacy - 6.1.3-SNAPSHOT - provided - - + 4.0.0 + + net.goldtreeservers + worldguardextraflags + 4.1.4-DEV + + + net.goldtreeservers.worldguardextraflags + wg6 + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + sk89q-repo + https://maven.sk89q.com/repo/ + + + + + + net.goldtreeservers.worldguardextraflags + wg + ${project.version} + provided + + + org.spigotmc + spigot-api + 1.13-R0.1-SNAPSHOT + provided + + + com.sk89q + guavabackport + 1.2 + provided + + + com.sk89q.worldedit + worldedit-bukkit + 6.1.3-SNAPSHOT + provided + + + com.sk89q.worldguard + worldguard-legacy + 6.1.3-SNAPSHOT + provided + + \ No newline at end of file diff --git a/WG7/pom.xml b/WG7/pom.xml index be126b5..622f9ee 100644 --- a/WG7/pom.xml +++ b/WG7/pom.xml @@ -1,61 +1,61 @@ - 4.0.0 - - net.goldtreeservers - worldguardextraflags - 4.1.4-DEV - - - net.goldtreeservers.worldguardextraflags - wg7 - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - sk89q-repo - https://maven.sk89q.com/repo/ - - - - - - net.goldtreeservers.worldguardextraflags - wg - ${project.version} - provided - - - org.spigotmc - spigot-api - 1.14.4-R0.1-SNAPSHOT - provided - - - com.sk89q.worldedit - worldedit-core - 7.0.0-SNAPSHOT - provided - - - com.sk89q.worldedit - worldedit-bukkit - 7.0.0-SNAPSHOT - provided - - - com.sk89q.worldguard - worldguard-core - 7.0.0-SNAPSHOT - provided - - - com.sk89q.worldguard - worldguard-legacy - 7.0.0-SNAPSHOT - provided - - + 4.0.0 + + net.goldtreeservers + worldguardextraflags + 4.1.4-DEV + + + net.goldtreeservers.worldguardextraflags + wg7 + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + sk89q-repo + https://maven.sk89q.com/repo/ + + + + + + net.goldtreeservers.worldguardextraflags + wg + ${project.version} + provided + + + org.spigotmc + spigot-api + 1.14.4-R0.1-SNAPSHOT + provided + + + com.sk89q.worldedit + worldedit-core + 7.0.0-SNAPSHOT + provided + + + com.sk89q.worldedit + worldedit-bukkit + 7.0.0-SNAPSHOT + provided + + + com.sk89q.worldguard + worldguard-core + 7.0.0-SNAPSHOT + provided + + + com.sk89q.worldguard + worldguard-legacy + 7.0.0-SNAPSHOT + provided + + \ No newline at end of file