diff --git a/.gitignore b/.gitignore index 1e4e21fc2..55a967c95 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,126 @@ +### Others ### *.bat +*.cmd +*.sh *.prefs + +### Maven ### +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties + + +### Java ### *.class -/target/classes -/target/PlotSquared-Null.jar -/target/PlotSquared-Uber.jar -/target/maven-archiver -*.project -*.classpath -/target/ + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + + +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm + +*.iml + +## Directory-based project format: +.idea/ +# if you remove the above rule, at least ignore the following: + +# User-specific stuff: +# .idea/workspace.xml +# .idea/tasks.xml +# .idea/dictionaries +# .idea/shelf + +# Sensitive or high-churn files: +# .idea/dataSources.ids +# .idea/dataSources.xml +# .idea/sqlDataSources.xml +# .idea/dynamic.xml +# .idea/uiDesigner.xml + +# Gradle: +# .idea/gradle.xml +# .idea/libraries + +# Mongo Explorer plugin: +# .idea/mongoSettings.xml + +## File-based project format: +*.ipr +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + + +### Eclipse ### +*.pydevproject +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath + +# Eclipse Core +.project + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# JDT-specific (Eclipse Java Development Tools) +.classpath + +# Java annotation processor (APT) +.factorypath + +# PDT-specific +.buildpath + +# sbteclipse plugin +.target + +# TeXlipse plugin +.texlipse + +# STS (Spring Tool Suite) +.springBeans diff --git a/README.md b/README.md index 7d99e1f2d..d587617ac 100644 --- a/README.md +++ b/README.md @@ -22,18 +22,18 @@ is to provide a lag-free and smooth experience. # Maven -We're now on maven! +We're now on maven! (Unofficial Maven Repo) ```xml - intellectualsites + xephi-repo http://ci.xephi.fr/plugin/repository/everything/ com.intellectualcrafters - PlotSquared - 3.2.24 + plotsquared + 3.2.27-SNAPSHOT ``` diff --git a/pom.xml b/pom.xml index 6a30592d8..e3cc88bf1 100644 --- a/pom.xml +++ b/pom.xml @@ -1,59 +1,102 @@ - 4.0.0 + com.intellectualcrafters + plotsquared + 3.2.27-SNAPSHOT + jar + + PlotSquared + Reinventing the plotworld! + http://www.spigotmc.org/resources/plotsquared.1177/ + + + IntellectualSites + https://github.com/IntellectualSites + + + + scm:git:https://github.com/IntellectualSites/PlotSquared.git + scm:git:git@github.com:IntellectualSites/PlotSquared.git + https://github.com/IntellectualSites/PlotSquared + + + + + jenkins + http://ci.xephi.fr/job/PlotSquared/ + + + + + The GNU General Public Licence version 3 (GPLv3) + http://www.gnu.org/licenses/gpl-3.0.html + + + + + 3.3.3 + + UTF-8 + + + 1.7 + + + 1.8.8-R0.1-SNAPSHOT + 3.1.0-SNAPSHOT - PlotSquared - 3.2.26 - PlotSquared - jar + - PlotSquared-Uber + ${project.name}-Bukkit-${project.version} src/main/java + true - - skyblock.template - town.template - + + plugin.yml + ${basedir}/src/main/resources/ false - - skyblock.template - town.template - s_chinese.yml - s_chinese_unescaped.yml - german.yml - italian.yml - + + plugin.yml + ${basedir}/src/main/resources/ + + + + + + org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + 3.3 1.7 - 1.7 + ${javaVersion} + + **/com/plotsquared/sponge/** + + + + org.apache.maven.plugins + maven-shade-plugin + 2.4.3 + + false + false + + + com.google.gson + com.plotsquared.libs.gson + + + javax.websocket + com.plotsquared.libs.websocket + + + org.apache.commons.math3 + com.plotsquared.libs.math3 + + + + + + package + + shade + + + + + + + - - techcable-repo - - http://repo.techcable.net/content/groups/public/ - - - empcraft-repo - http://empcraft.com/maven2 - spigot-repo http://hub.spigotmc.org/nexus/content/groups/public/ - - confuser-repo - http://ci.frostcast.net/plugin/repository/everything - - - sk80q - http://maven.sk89q.com/artifactory/repo/ - - - vault-repo - http://nexus.theyeticave.net/content/repositories/pub_releases - + + + + + sk89q + http://maven.sk89q.com/repo/ + + + + vault-repo + http://nexus.theyeticave.net/content/repositories/pub_releases + + + + + + org.bukkit + bukkit + ${bukkitVersion} + provided + true + + + junit + junit + + + gson + com.google.code.gson + + + persistence-api + javax.persistence + + + + + + javax.websocket javax.websocket-api 1.1 + compile + true - - org.spongepowered - spongeapi - 2.1-SNAPSHOT - - - org.bukkit - bukkit - 1.8.3-R0.1-SNAPSHOT - + com.sk89q worldedit 6.0.0-SNAPSHOT - jar - compile + provided + true + + + truezip + de.schlichtherle + + + js + rhino + + + jsr305 + com.google.code.findbugs + + + guava + com.google.guava + + + org.apache.commons commons-math3 - 3.2 + 3.6 + compile + true - + + + net.milkbowl.vault VaultAPI 1.5 provided + true + + + org.bukkit + bukkit + + + + com.google.code.gson gson - 2.3.1 + 2.5 + compile + true + - \ No newline at end of file + diff --git a/src/main/java/com/intellectualcrafters/configuration/file/YamlConfiguration.java b/src/main/java/com/intellectualcrafters/configuration/file/YamlConfiguration.java index 1ab3a6f61..47918f856 100644 --- a/src/main/java/com/intellectualcrafters/configuration/file/YamlConfiguration.java +++ b/src/main/java/com/intellectualcrafters/configuration/file/YamlConfiguration.java @@ -30,6 +30,7 @@ public class YamlConfiguration extends FileConfiguration { private final Yaml yaml = new Yaml(new YamlConstructor(), yamlRepresenter, yamlOptions); @Override + @SuppressWarnings("deprecation") public String saveToString() { yamlOptions.setIndent(options().indent()); yamlOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); diff --git a/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java b/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java index d24a573bb..0348c766a 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java @@ -13,7 +13,6 @@ import java.util.regex.Pattern; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.Permissions; import com.intellectualcrafters.plot.util.StringMan; import com.plotsquared.general.commands.Command; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java b/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java index 89e6c1e19..46f18d2ba 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java @@ -27,7 +27,7 @@ import com.intellectualcrafters.plot.object.PlotPlayer; * SubCommand class * */ -@SuppressWarnings({ "deprecation", "unused" }) +@SuppressWarnings({ "deprecation" }) public abstract class SubCommand extends com.plotsquared.general.commands.Command { /** diff --git a/src/main/java/com/intellectualcrafters/plot/config/Configuration.java b/src/main/java/com/intellectualcrafters/plot/config/Configuration.java index 59446b92c..b22cd75dd 100644 --- a/src/main/java/com/intellectualcrafters/plot/config/Configuration.java +++ b/src/main/java/com/intellectualcrafters/plot/config/Configuration.java @@ -30,7 +30,6 @@ import com.intellectualcrafters.plot.util.StringComparison; * Main Configuration Utility * */ -@SuppressWarnings("unused") public class Configuration { public static final SettingValue STRING = new SettingValue("STRING") { diff --git a/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java b/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java index 8f0b21629..412509dec 100644 --- a/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java +++ b/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java @@ -45,7 +45,6 @@ import com.intellectualcrafters.plot.util.Permissions; */ -@SuppressWarnings("unused") public class FlagManager { private final static HashSet reserved = new HashSet<>(); diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java b/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java index 128426928..c0179735f 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java +++ b/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java @@ -42,7 +42,7 @@ public class PlotHandler { if (!plot.isMerged()) { return false; } - for (Plot current : MainUtil.getConnectedPlots(plot);) { + for (Plot current : MainUtil.getConnectedPlots(plot)) { if (current.owner.equals(uuid)) { return true; } diff --git a/src/main/java/com/intellectualcrafters/plot/util/ConsoleColors.java b/src/main/java/com/intellectualcrafters/plot/util/ConsoleColors.java index 2d7ea0481..99760bcd7 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/ConsoleColors.java +++ b/src/main/java/com/intellectualcrafters/plot/util/ConsoleColors.java @@ -95,7 +95,6 @@ public class ConsoleColors { win = lin; } - @SuppressWarnings("unused") public String getWin() { return win; } diff --git a/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java b/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java index c9b090f89..60344354e 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java +++ b/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java @@ -186,7 +186,8 @@ public abstract class EventUtil { if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) { return true; } - return !(!false || MainUtil.sendMessage(pp, C.FLAG_TUTORIAL_USAGE, C.FLAG_USE.s() + "/" + C.FLAG_DEVICE_INTERACT.s())); + // TODO: fix the commented dead code + return true; //!(!false || MainUtil.sendMessage(pp, C.FLAG_TUTORIAL_USAGE, C.FLAG_USE.s() + "/" + C.FLAG_DEVICE_INTERACT.s())); } return true; } diff --git a/src/main/java/com/intellectualcrafters/plot/util/StringComparison.java b/src/main/java/com/intellectualcrafters/plot/util/StringComparison.java index c066390f8..1d05cd1ca 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/StringComparison.java +++ b/src/main/java/com/intellectualcrafters/plot/util/StringComparison.java @@ -28,7 +28,6 @@ import java.util.Collections; * String comparison library * */ -@SuppressWarnings("unused") public class StringComparison { private T bestMatch; diff --git a/src/main/java/com/intellectualcrafters/plot/uuid/UUIDFetcher.java b/src/main/java/com/intellectualcrafters/plot/uuid/UUIDFetcher.java index 4f5a016d6..76efa713d 100644 --- a/src/main/java/com/intellectualcrafters/plot/uuid/UUIDFetcher.java +++ b/src/main/java/com/intellectualcrafters/plot/uuid/UUIDFetcher.java @@ -5,7 +5,6 @@ import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.URL; import java.nio.ByteBuffer; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java b/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java index 056927714..e2c29cac1 100644 --- a/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java +++ b/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java @@ -29,7 +29,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.sql.Connection; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Map.Entry; @@ -210,9 +209,13 @@ public class LikePlotMeConverter { final String actualWorldName = getWorld(world); final String plotMeWorldName = world.toLowerCase(); Integer pathwidth = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".PathWidth"); // + /* + * TODO: dead code + * if (pathwidth == null) { pathwidth = 7; } + */ PS.get().config.set("worlds." + world + ".road.width", pathwidth); Integer pathheight = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".RoadHeight"); // diff --git a/src/main/java/com/plotsquared/bukkit/util/BukkitHybridUtils.java b/src/main/java/com/plotsquared/bukkit/util/BukkitHybridUtils.java index 8dce0107d..6bdd52cf6 100644 --- a/src/main/java/com/plotsquared/bukkit/util/BukkitHybridUtils.java +++ b/src/main/java/com/plotsquared/bukkit/util/BukkitHybridUtils.java @@ -1,8 +1,6 @@ package com.plotsquared.bukkit.util; -import java.util.ArrayList; import java.util.HashSet; -import java.util.List; import java.util.Random; import org.bukkit.Bukkit; @@ -15,11 +13,8 @@ import org.bukkit.generator.ChunkGenerator.BiomeGrid; import org.bukkit.material.Directional; import org.bukkit.material.MaterialData; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.flag.FlagManager; import com.intellectualcrafters.plot.generator.HybridUtils; import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotAnalysis; import com.intellectualcrafters.plot.object.PlotBlock; import com.intellectualcrafters.plot.object.RegionWrapper; diff --git a/src/main/java/com/plotsquared/general/commands/CommandManager.java b/src/main/java/com/plotsquared/general/commands/CommandManager.java index e0d234c89..022df5b0c 100644 --- a/src/main/java/com/plotsquared/general/commands/CommandManager.java +++ b/src/main/java/com/plotsquared/general/commands/CommandManager.java @@ -10,7 +10,6 @@ import java.util.concurrent.ConcurrentHashMap; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.util.Permissions; -@SuppressWarnings("unused") public class CommandManager { final public ConcurrentHashMap> commands; diff --git a/src/main/java/com/plotsquared/object/schematic/StateWrapper.java b/src/main/java/com/plotsquared/object/schematic/StateWrapper.java index ab3658fa6..1d521b704 100644 --- a/src/main/java/com/plotsquared/object/schematic/StateWrapper.java +++ b/src/main/java/com/plotsquared/object/schematic/StateWrapper.java @@ -91,7 +91,10 @@ public class StateWrapper { } return tags; } - + + /* + * TODO: Move this into the spongee module! + * public Map serializeItem(final org.spongepowered.api.item.inventory.ItemStack item) { final Map data = new HashMap(); @@ -99,6 +102,7 @@ public class StateWrapper { return data; } + */ public Map serializeItem(final ItemStack item) { final Map data = new HashMap(); diff --git a/target/PlotSquared-Bukkit.jar b/target/PlotSquared-Bukkit.jar deleted file mode 100644 index 38aa60357..000000000 Binary files a/target/PlotSquared-Bukkit.jar and /dev/null differ diff --git a/target/PlotSquared-Sponge.jar b/target/PlotSquared-Sponge.jar deleted file mode 100644 index 092d86ab5..000000000 Binary files a/target/PlotSquared-Sponge.jar and /dev/null differ