EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2757 from IntellectualSites/api/v5/packages

Browse Source 
Package Restructure
This commit is contained in:
Alexander Söderberg 2020-04-16 10:58:13 +02:00 committed by GitHub
commit 4aac3bf7e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
535 changed files with 3104 additions and 14209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

287
.gitignore vendored
View File

@ -1,143 +1,144 @@
### Others ### ### Others ###
*.cmd *.cmd
*.sh *.sh
*.prefs *.prefs
Sponge/build Sponge/build
Core/build Core/build
Bukkit/build Bukkit/build
Nukkit/build Nukkit/build
buildSrc/
### Maven ###
/mvn ### Maven ###
/target/lib /mvn
/target/maven-archiver /target/lib
/target/classes /target/maven-archiver
/target/maven-status /target/classes
pom.xml.tag /target/maven-status
pom.xml.releaseBackup pom.xml.tag
pom.xml.versionsBackup pom.xml.releaseBackup
pom.xml.next pom.xml.versionsBackup
release.properties pom.xml.next
dependency-reduced-pom.xml release.properties
buildNumber.properties dependency-reduced-pom.xml
.mvn/timing.properties buildNumber.properties
out/ .mvn/timing.properties
out/
### Java ###
*.class ### Java ###
*.class
# Mobile Tools for Java (J2ME)
.mtj.tmp/ # Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.war # Package Files #
*.ear *.war
*.ear
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid* # 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 ### Intellij ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
*.iml
*.iml
## Directory-based project format:
.idea/ ## Directory-based project format:
# if you remove the above rule, at least ignore the following: .idea/
# if you remove the above rule, at least ignore the following:
# User-specific stuff:
# .idea/workspace.xml # User-specific stuff:
# .idea/tasks.xml # .idea/workspace.xml
# .idea/dictionaries # .idea/tasks.xml
# .idea/shelf # .idea/dictionaries
# .idea/shelf
# Sensitive or high-churn files:
# .idea/dataSources.ids # Sensitive or high-churn files:
# .idea/dataSources.xml # .idea/dataSources.ids
# .idea/sqlDataSources.xml # .idea/dataSources.xml
# .idea/dynamic.xml # .idea/sqlDataSources.xml
# .idea/uiDesigner.xml # .idea/dynamic.xml
# .idea/uiDesigner.xml
# Gradle:
# .idea/gradle.xml # Gradle:
# .idea/libraries # .idea/gradle.xml
.gradle # .idea/libraries
.gradle
# Mongo Explorer plugin:
# .idea/mongoSettings.xml # Mongo Explorer plugin:
# .idea/mongoSettings.xml
## File-based project format:
*.ipr ## File-based project format:
*.iws *.ipr
*.iws
## Plugin-specific files:
## Plugin-specific files:
# IntelliJ
/out/ # IntelliJ
/out/
# mpeltonen/sbt-idea plugin
.idea_modules/ # mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml # JIRA plugin
atlassian-ide-plugin.xml
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml # Crashlytics plugin (for Android Studio and IntelliJ)
crashlytics.properties com_crashlytics_export_strings.xml
crashlytics-build.properties crashlytics.properties
fabric.properties crashlytics-build.properties
fabric.properties
### Eclipse ###
*.pydevproject ### Eclipse ###
.metadata *.pydevproject
bin/ .metadata
tmp/ bin/
*.tmp tmp/
*.bak *.tmp
*.swp *.bak
*~.nib *.swp
local.properties *~.nib
.settings/ local.properties
.loadpath .settings/
.loadpath
# Eclipse Core
.project # Eclipse Core
.project
# External tool builders
.externalToolBuilders/ # External tool builders
.externalToolBuilders/
# Locally stored "Eclipse launch configurations"
*.launch # Locally stored "Eclipse launch configurations"
*.launch
# CDT-specific
.cproject # CDT-specific
.cproject
# JDT-specific (Eclipse Java Development Tools)
.classpath # JDT-specific (Eclipse Java Development Tools)
.classpath
# Java annotation processor (APT)
.factorypath # Java annotation processor (APT)
.factorypath
# PDT-specific
.buildpath # PDT-specific
.buildpath
# sbteclipse plugin
.target # sbteclipse plugin
.target
# TeXlipse plugin
.texlipse # TeXlipse plugin
.texlipse
# STS (Spring Tool Suite)
.springBeans # STS (Spring Tool Suite)
/target/ .springBeans
Nukkit/build/classes/ /target/
Nukkit/build/dependency-cache/ Nukkit/build/classes/
checkstyle.xml Nukkit/build/dependency-cache/
classes/ checkstyle.xml
p2error.txt classes/
*.bat p2error.txt
Nukkit/build/resources/main/plugin.yml *.bat
docs/ Nukkit/build/resources/main/plugin.yml
docs/

16
Bukkit/build.gradle
View File

@ -46,7 +46,7 @@ processResources {
//noinspection GroovyAssignabilityCheck //noinspection GroovyAssignabilityCheck
jar.archiveFileName = "PlotSquared-Bukkit-${project.parent.version}.jar" jar.archiveFileName = "PlotSquared-Bukkit-${project.parent.version}.jar"
jar.destinationDirectory = file("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-Bukkit/" + project.parent.version) jar.destinationDirectory = file("../mvn/com/plotsquared/PlotSquared-Bukkit/" + project.parent.version)
task createPom { task createPom {
doLast { doLast {
pom { pom {
@ -55,14 +55,14 @@ task createPom {
artifactId = "PlotSquared-Bukkit" artifactId = "PlotSquared-Bukkit"
version = rootProject.version version = rootProject.version
} }
}.writeTo("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-Bukkit/${project.parent.version}/PlotSquared-Bukkit-${project.parent.version}.pom") }.writeTo("../mvn/com/plotsquared/PlotSquared-Bukkit/${project.parent.version}/PlotSquared-Bukkit-${project.parent.version}.pom")
pom { pom {
project { project {
groupId = rootProject.group groupId = rootProject.group
artifactId = "PlotSquared-Bukkit" artifactId = "PlotSquared-Bukkit"
version = "latest" version = "latest"
} }
}.writeTo("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-Bukkit/latest/PlotSquared-Bukkit-latest.pom") }.writeTo("../mvn/com/plotsquared/PlotSquared-Bukkit/latest/PlotSquared-Bukkit-latest.pom")
.writeTo("pom.xml") .writeTo("pom.xml")
} }
} }
@ -70,8 +70,8 @@ task createPom {
task copyFiles { task copyFiles {
doLast { doLast {
copy { copy {
from("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-Bukkit/${project.parent.version}/") from("../mvn/com/plotsquared/PlotSquared-Bukkit/${project.parent.version}/")
into("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-Bukkit/latest/") into("../mvn/com/plotsquared/PlotSquared-Bukkit/latest/")
include("PlotSquared-Bukkit*.jar") include("PlotSquared-Bukkit*.jar")
rename("PlotSquared-Bukkit-${project.parent.version}.jar", "PlotSquared-Bukkit-latest.jar") rename("PlotSquared-Bukkit-${project.parent.version}.jar", "PlotSquared-Bukkit-latest.jar")
} }
@ -86,9 +86,9 @@ shadowJar {
include(dependency("net.kyori:text-adapter-bukkit:3.0.3")) include(dependency("net.kyori:text-adapter-bukkit:3.0.3"))
include(dependency("org.bstats:bstats-bukkit:1.7")) include(dependency("org.bstats:bstats-bukkit:1.7"))
} }
relocate('net.kyori.text', 'com.github.intellectualsites.plotsquared.formatting.text') relocate('net.kyori.text', 'com.plotsquared.formatting.text')
relocate("io.papermc.lib", "com.github.intellectualsites.plotsquared.bukkit.paperlib") relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib")
relocate("org.bstats", "com.github.intellectualsites.plotsquared.metrics") relocate("org.bstats", "com.plotsquared.metrics")
archiveFileName = "${parent.name}-${project.name}-${parent.version}.jar" archiveFileName = "${parent.name}-${project.name}-${parent.version}.jar"
destinationDirectory = file "../target" destinationDirectory = file "../target"
} }

4
Bukkit/pom.xml
View File

@ -2,7 +2,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.github.intellectualsites.plotsquared</groupId> <groupId>com.plotsquared</groupId>
<artifactId>PlotSquared-Bukkit</artifactId> <artifactId>PlotSquared-Bukkit</artifactId>
<version>latest</version> <version>latest</version>
<dependencies> <dependencies>
@ -19,7 +19,7 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.intellectualsites.plotsquared</groupId> <groupId>com.plotsquared</groupId>
<artifactId>Core</artifactId> <artifactId>Core</artifactId>
<version>unspecified</version> <version>unspecified</version>
<scope>compile</scope> <scope>compile</scope>

30
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitVersion.java
View File

@ -1,30 +0,0 @@
/*
* _____ _ _ _____ _
* | __ \| | | | / ____| | |
* | |__) | | ___ | |_| (___ __ _ _ _ __ _ _ __ ___ __| |
* | ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
* | | | | (_) | |_ ____) | (_| | |_| | (_| | | | __/ (_| |
* |_| |_|\___/ \__|_____/ \__, |\__,_|\__,_|_| \___|\__,_|
* | |
* |_|
* PlotSquared plot management system for Minecraft
* Copyright (C) 2020 IntellectualSites
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.github.intellectualsites.plotsquared.bukkit.util;
public class BukkitVersion {
public static int[] v1_13_2 = {1, 13, 2};
}

50
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java → Bukkit/src/main/java/com/plotsquared/bukkit/BukkitChunkManager.java
View File

@ -23,26 +23,26 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.util; package com.plotsquared.bukkit;
import com.github.intellectualsites.plotsquared.bukkit.BukkitMain; import com.plotsquared.bukkit.entity.EntityWrapper;
import com.github.intellectualsites.plotsquared.bukkit.object.entity.EntityWrapper; import com.plotsquared.bukkit.entity.ReplicatingEntityWrapper;
import com.github.intellectualsites.plotsquared.bukkit.object.entity.ReplicatingEntityWrapper; import com.plotsquared.bukkit.util.BukkitUtil;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.generator.AugmentedUtils; import com.plotsquared.core.generator.AugmentedUtils;
import com.github.intellectualsites.plotsquared.plot.listener.WEExtent; import com.plotsquared.core.listener.WEExtent;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.location.PlotLoc;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.PlotLoc; import com.plotsquared.core.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; import com.plotsquared.core.queue.GlobalBlockQueue;
import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; import com.plotsquared.core.queue.LocalBlockQueue;
import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import com.plotsquared.core.queue.ScopedLocalBlockQueue;
import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; import com.plotsquared.core.util.ChunkManager;
import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; import com.plotsquared.core.util.RegionUtil;
import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; import com.plotsquared.core.util.entity.EntityCategories;
import com.github.intellectualsites.plotsquared.plot.util.entity.EntityCategories; import com.plotsquared.core.util.task.RunnableVal;
import com.github.intellectualsites.plotsquared.plot.util.world.RegionUtil; import com.plotsquared.core.util.task.TaskManager;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.BukkitWorld; import com.sk89q.worldedit.bukkit.BukkitWorld;
import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector2;
@ -71,13 +71,13 @@ import java.util.Set;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Semaphore; import java.util.concurrent.Semaphore;
import static com.github.intellectualsites.plotsquared.plot.util.entity.EntityCategories.CAP_ANIMAL;
import static com.github.intellectualsites.plotsquared.plot.util.entity.EntityCategories.CAP_ENTITY;
import static com.github.intellectualsites.plotsquared.plot.util.entity.EntityCategories.CAP_MISC;
import static com.github.intellectualsites.plotsquared.plot.util.entity.EntityCategories.CAP_MOB;
import static com.github.intellectualsites.plotsquared.plot.util.entity.EntityCategories.CAP_MONSTER;
import static com.github.intellectualsites.plotsquared.plot.util.entity.EntityCategories.CAP_VEHICLE;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static com.plotsquared.core.util.entity.EntityCategories.CAP_ANIMAL;
import static com.plotsquared.core.util.entity.EntityCategories.CAP_ENTITY;
import static com.plotsquared.core.util.entity.EntityCategories.CAP_MISC;
import static com.plotsquared.core.util.entity.EntityCategories.CAP_MOB;
import static com.plotsquared.core.util.entity.EntityCategories.CAP_MONSTER;
import static com.plotsquared.core.util.entity.EntityCategories.CAP_VEHICLE;
public class BukkitChunkManager extends ChunkManager { public class BukkitChunkManager extends ChunkManager {

15
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitCommand.java → Bukkit/src/main/java/com/plotsquared/bukkit/BukkitCommand.java
View File

@ -23,12 +23,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.util; package com.plotsquared.bukkit;
import com.github.intellectualsites.plotsquared.bukkit.commands.DebugUUID; import com.plotsquared.bukkit.command.DebugUUID;
import com.github.intellectualsites.plotsquared.plot.commands.MainCommand; import com.plotsquared.bukkit.util.BukkitUtil;
import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer; import com.plotsquared.core.command.MainCommand;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.player.ConsolePlayer;
import com.plotsquared.core.player.PlotPlayer;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -73,12 +74,12 @@ public class BukkitCommand implements CommandExecutor, TabCompleter {
if (args.length == 0) { if (args.length == 0) {
return Collections.singletonList("plots"); return Collections.singletonList("plots");
} }
Collection<com.github.intellectualsites.plotsquared.commands.Command> objects = MainCommand.getInstance().tab(player, args, s.endsWith(" ")); Collection<com.plotsquared.core.command.Command> objects = MainCommand.getInstance().tab(player, args, s.endsWith(" "));
if (objects == null) { if (objects == null) {
return null; return null;
} }
List<String> result = new ArrayList<>(); List<String> result = new ArrayList<>();
for (com.github.intellectualsites.plotsquared.commands.Command o : objects) { for (com.plotsquared.core.command.Command o : objects) {
result.add(o.toString()); result.add(o.toString());
} }
return result.isEmpty() ? null : result; return result.isEmpty() ? null : result;

144
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java → Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
View File

@ -23,75 +23,73 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit; package com.plotsquared.bukkit;
import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator; import com.plotsquared.bukkit.generator.BukkitPlotGenerator;
import com.github.intellectualsites.plotsquared.bukkit.listeners.ChunkListener; import com.plotsquared.bukkit.listener.ChunkListener;
import com.github.intellectualsites.plotsquared.bukkit.listeners.EntitySpawnListener; import com.plotsquared.bukkit.listener.EntitySpawnListener;
import com.github.intellectualsites.plotsquared.bukkit.listeners.PlayerEvents; import com.plotsquared.bukkit.listener.PlayerEvents;
import com.github.intellectualsites.plotsquared.bukkit.listeners.SingleWorldListener; import com.plotsquared.bukkit.listener.SingleWorldListener;
import com.github.intellectualsites.plotsquared.bukkit.listeners.WorldEvents; import com.plotsquared.bukkit.listener.WorldEvents;
import com.github.intellectualsites.plotsquared.bukkit.placeholders.PlaceholderFormatter; import com.plotsquared.bukkit.placeholder.PlaceholderFormatter;
import com.github.intellectualsites.plotsquared.bukkit.placeholders.Placeholders; import com.plotsquared.bukkit.placeholder.Placeholders;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitChatManager; import com.plotsquared.bukkit.util.BukkitChatManager;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitChunkManager; import com.plotsquared.bukkit.util.BukkitEconHandler;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitCommand; import com.plotsquared.bukkit.generator.BukkitHybridUtils;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitEconHandler; import com.plotsquared.bukkit.util.BukkitInventoryUtil;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitHybridUtils; import com.plotsquared.bukkit.schematic.BukkitSchematicHandler;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitInventoryUtil; import com.plotsquared.bukkit.util.BukkitSetupUtils;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitSchematicHandler; import com.plotsquared.bukkit.util.BukkitTaskManager;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitSetupUtils; import com.plotsquared.bukkit.util.BukkitUtil;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitTaskManager; import com.plotsquared.bukkit.util.SetGenCB;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.UpdateUtility;
import com.github.intellectualsites.plotsquared.bukkit.util.SetGenCB; import com.plotsquared.bukkit.queue.BukkitLocalQueue;
import com.github.intellectualsites.plotsquared.bukkit.util.UpdateUtility; import com.plotsquared.bukkit.util.uuid.DefaultUUIDWrapper;
import com.github.intellectualsites.plotsquared.bukkit.util.block.BukkitLocalQueue; import com.plotsquared.bukkit.util.uuid.FileUUIDHandler;
import com.github.intellectualsites.plotsquared.bukkit.uuid.DefaultUUIDWrapper; import com.plotsquared.bukkit.util.uuid.LowerOfflineUUIDWrapper;
import com.github.intellectualsites.plotsquared.bukkit.uuid.FileUUIDHandler; import com.plotsquared.bukkit.util.uuid.OfflineUUIDWrapper;
import com.github.intellectualsites.plotsquared.bukkit.uuid.LowerOfflineUUIDWrapper; import com.plotsquared.bukkit.util.uuid.SQLUUIDHandler;
import com.github.intellectualsites.plotsquared.bukkit.uuid.OfflineUUIDWrapper; import com.plotsquared.core.configuration.ConfigurationSection;
import com.github.intellectualsites.plotsquared.bukkit.uuid.SQLUUIDHandler; import com.plotsquared.core.IPlotMain;
import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.IPlotMain; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.configuration.ChatFormatter;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.ConfigurationNode;
import com.github.intellectualsites.plotsquared.plot.config.ChatFormatter; import com.plotsquared.core.configuration.Settings;
import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; import com.plotsquared.core.generator.GeneratorWrapper;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.core.generator.HybridGen;
import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; import com.plotsquared.core.generator.HybridUtils;
import com.github.intellectualsites.plotsquared.plot.generator.HybridGen; import com.plotsquared.core.generator.IndependentPlotGenerator;
import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; import com.plotsquared.core.listener.PlotListener;
import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.listener.PlotListener; import com.plotsquared.core.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.plot.PlotAreaTerrainType;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.core.plot.PlotAreaType;
import com.github.intellectualsites.plotsquared.plot.object.PlotAreaTerrainType; import com.plotsquared.core.plot.PlotId;
import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.plotsquared.core.plot.SetupObject;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.plot.message.PlainChatManager;
import com.github.intellectualsites.plotsquared.plot.object.SetupObject; import com.plotsquared.core.plot.world.PlotAreaManager;
import com.github.intellectualsites.plotsquared.plot.object.chat.PlainChatManager; import com.plotsquared.core.plot.world.SinglePlotArea;
import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; import com.plotsquared.core.plot.world.SinglePlotAreaManager;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; import com.plotsquared.core.generator.SingleWorldGenerator;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; import com.plotsquared.core.util.ChatManager;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SingleWorldGenerator; import com.plotsquared.core.util.ChunkManager;
import com.github.intellectualsites.plotsquared.plot.util.ChatManager; import com.plotsquared.core.util.ConsoleColors;
import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; import com.plotsquared.core.util.EconHandler;
import com.github.intellectualsites.plotsquared.plot.util.ConsoleColors; import com.plotsquared.core.util.InventoryUtil;
import com.github.intellectualsites.plotsquared.plot.util.EconHandler; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.InventoryUtil; import com.plotsquared.core.util.PremiumVerification;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.ReflectionUtils;
import com.github.intellectualsites.plotsquared.plot.util.PremiumVerification; import com.plotsquared.core.util.SchematicHandler;
import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils; import com.plotsquared.core.util.SetupUtils;
import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; import com.plotsquared.core.util.StringMan;
import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; import com.plotsquared.core.util.task.TaskManager;
import com.github.intellectualsites.plotsquared.plot.util.StringMan; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import com.plotsquared.core.util.uuid.UUIDHandlerImplementation;
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import com.plotsquared.core.util.WorldUtil;
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandlerImplementation; import com.plotsquared.core.queue.QueueProvider;
import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; import com.plotsquared.core.util.uuid.UUIDWrapper;
import com.github.intellectualsites.plotsquared.plot.util.block.QueueProvider;
import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.bukkit.WorldEditPlugin; import com.sk89q.worldedit.bukkit.WorldEditPlugin;
import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Actor;
@ -129,8 +127,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import static com.github.intellectualsites.plotsquared.plot.util.PremiumVerification.getUserID; import static com.plotsquared.core.util.PremiumVerification.getUserID;
import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass; import static com.plotsquared.core.util.ReflectionUtils.getRefClass;
public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain { public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
@ -411,7 +409,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
case MINECART_TNT: case MINECART_TNT:
case BOAT: case BOAT:
if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) { if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
com.github.intellectualsites.plotsquared.plot.object.Location com.plotsquared.core.location.Location
location = BukkitUtil.getLocation(entity.getLocation()); location = BukkitUtil.getLocation(entity.getLocation());
Plot plot = location.getPlot(); Plot plot = location.getPlot();
if (plot == null) { if (plot == null) {
@ -468,7 +466,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
PlotId originalPlotId = (PlotId) meta.get(0).value(); PlotId originalPlotId = (PlotId) meta.get(0).value();
if (originalPlotId != null) { if (originalPlotId != null) {
com.github.intellectualsites.plotsquared.plot.object.Location com.plotsquared.core.location.Location
pLoc = BukkitUtil.getLocation(entity.getLocation()); pLoc = BukkitUtil.getLocation(entity.getLocation());
PlotArea area = pLoc.getPlotArea(); PlotArea area = pLoc.getPlotArea();
if (area != null) { if (area != null) {
@ -487,7 +485,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
} }
} else { } else {
//This is to apply the metadata to already spawned shulkers (see EntitySpawnListener.java) //This is to apply the metadata to already spawned shulkers (see EntitySpawnListener.java)
com.github.intellectualsites.plotsquared.plot.object.Location com.plotsquared.core.location.Location
pLoc = BukkitUtil.getLocation(entity.getLocation()); pLoc = BukkitUtil.getLocation(entity.getLocation());
PlotArea area = pLoc.getPlotArea(); PlotArea area = pLoc.getPlotArea();
if (area != null) { if (area != null) {

2
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/ArrayWrapper.java → Bukkit/src/main/java/com/plotsquared/bukkit/chat/ArrayWrapper.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.chat; package com.plotsquared.bukkit.chat;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;

2
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java → Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.chat; package com.plotsquared.bukkit.chat;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;

2
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/JsonRepresentedObject.java → Bukkit/src/main/java/com/plotsquared/bukkit/chat/JsonRepresentedObject.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.chat; package com.plotsquared.bukkit.chat;
import com.google.gson.stream.JsonWriter; import com.google.gson.stream.JsonWriter;

2
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/JsonString.java → Bukkit/src/main/java/com/plotsquared/bukkit/chat/JsonString.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.chat; package com.plotsquared.bukkit.chat;
import com.google.gson.stream.JsonWriter; import com.google.gson.stream.JsonWriter;
import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.configuration.serialization.ConfigurationSerializable;

2
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/MessagePart.java → Bukkit/src/main/java/com/plotsquared/bukkit/chat/MessagePart.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.chat; package com.plotsquared.bukkit.chat;
import com.google.common.collect.BiMap; import com.google.common.collect.BiMap;
import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableBiMap;

2
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/Reflection.java → Bukkit/src/main/java/com/plotsquared/bukkit/chat/Reflection.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.chat; package com.plotsquared.bukkit.chat;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

2
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/TextualComponent.java → Bukkit/src/main/java/com/plotsquared/bukkit/chat/TextualComponent.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.chat; package com.plotsquared.bukkit.chat;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;

46
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java → Bukkit/src/main/java/com/plotsquared/bukkit/command/DebugUUID.java
View File

@ -23,30 +23,30 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.commands; package com.plotsquared.bukkit.command;
import com.github.intellectualsites.plotsquared.bukkit.uuid.DatFileFilter; import com.plotsquared.bukkit.util.uuid.DatFileFilter;
import com.github.intellectualsites.plotsquared.bukkit.uuid.DefaultUUIDWrapper; import com.plotsquared.bukkit.util.uuid.DefaultUUIDWrapper;
import com.github.intellectualsites.plotsquared.bukkit.uuid.LowerOfflineUUIDWrapper; import com.plotsquared.bukkit.util.uuid.LowerOfflineUUIDWrapper;
import com.github.intellectualsites.plotsquared.bukkit.uuid.OfflineUUIDWrapper; import com.plotsquared.bukkit.util.uuid.OfflineUUIDWrapper;
import com.github.intellectualsites.plotsquared.commands.Argument; import com.plotsquared.core.command.Argument;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.command.CommandDeclaration;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory; import com.plotsquared.core.command.CommandCategory;
import com.github.intellectualsites.plotsquared.plot.commands.RequiredType; import com.plotsquared.core.command.RequiredType;
import com.github.intellectualsites.plotsquared.plot.commands.SubCommand; import com.plotsquared.core.command.SubCommand;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; import com.plotsquared.core.player.OfflinePlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; import com.plotsquared.core.util.StringWrapper;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.StringMan; import com.plotsquared.core.util.StringMan;
import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; import com.plotsquared.core.util.WorldUtil;
import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; import com.plotsquared.core.util.uuid.UUIDWrapper;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import java.io.File; import java.io.File;

2
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/AgeableStats.java → Bukkit/src/main/java/com/plotsquared/bukkit/entity/AgeableStats.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.object.entity; package com.plotsquared.bukkit.entity;
class AgeableStats { class AgeableStats {

2
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ArmorStandStats.java → Bukkit/src/main/java/com/plotsquared/bukkit/entity/ArmorStandStats.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.object.entity; package com.plotsquared.bukkit.entity;
class ArmorStandStats { class ArmorStandStats {

2
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/EntityBaseStats.java → Bukkit/src/main/java/com/plotsquared/bukkit/entity/EntityBaseStats.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.object.entity; package com.plotsquared.bukkit.entity;
class EntityBaseStats { class EntityBaseStats {

2
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/EntityWrapper.java → Bukkit/src/main/java/com/plotsquared/bukkit/entity/EntityWrapper.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.object.entity; package com.plotsquared.bukkit.entity;
import lombok.Getter; import lombok.Getter;
import lombok.NonNull; import lombok.NonNull;

2
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/HorseStats.java → Bukkit/src/main/java/com/plotsquared/bukkit/entity/HorseStats.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.object.entity; package com.plotsquared.bukkit.entity;
import org.bukkit.entity.Horse; import org.bukkit.entity.Horse;

2
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/LivingEntityStats.java → Bukkit/src/main/java/com/plotsquared/bukkit/entity/LivingEntityStats.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.object.entity; package com.plotsquared.bukkit.entity;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffect;

4
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java → Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java
View File

@ -23,9 +23,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.object.entity; package com.plotsquared.bukkit.entity;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import org.bukkit.Art; import org.bukkit.Art;
import org.bukkit.DyeColor; import org.bukkit.DyeColor;
import org.bukkit.Location; import org.bukkit.Location;

2
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/TameableStats.java → Bukkit/src/main/java/com/plotsquared/bukkit/entity/TameableStats.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.object.entity; package com.plotsquared.bukkit.entity;
import org.bukkit.entity.AnimalTamer; import org.bukkit.entity.AnimalTamer;

4
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/TeleportEntityWrapper.java → Bukkit/src/main/java/com/plotsquared/bukkit/entity/TeleportEntityWrapper.java
View File

@ -23,9 +23,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.object.entity; package com.plotsquared.bukkit.entity;
import com.github.intellectualsites.plotsquared.bukkit.BukkitMain; import com.plotsquared.bukkit.BukkitMain;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;

16
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/PlotBlockPopulator.java → Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java
View File

@ -23,15 +23,15 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.generator; package com.plotsquared.bukkit.generator;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; import com.plotsquared.core.generator.IndependentPlotGenerator;
import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper; import com.plotsquared.core.location.ChunkWrapper;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; import com.plotsquared.core.queue.GlobalBlockQueue;
import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; import com.plotsquared.core.queue.LocalBlockQueue;
import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; import com.plotsquared.core.queue.ScopedLocalBlockQueue;
import java.util.Random; import java.util.Random;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.World; import org.bukkit.World;

4
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java → Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java
View File

@ -23,9 +23,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.generator; package com.plotsquared.bukkit.generator;
import com.github.intellectualsites.plotsquared.plot.generator.AugmentedUtils; import com.plotsquared.core.generator.AugmentedUtils;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.generator.BlockPopulator; import org.bukkit.generator.BlockPopulator;

4
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java → Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitHybridUtils.java
View File

@ -23,9 +23,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.util; package com.plotsquared.bukkit.generator;
import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; import com.plotsquared.core.generator.HybridUtils;
public class BukkitHybridUtils extends HybridUtils { public class BukkitHybridUtils extends HybridUtils {

24
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java → Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java
View File

@ -23,19 +23,19 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.generator; package com.plotsquared.bukkit.generator;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.github.intellectualsites.plotsquared.bukkit.util.block.GenChunk; import com.plotsquared.bukkit.queue.GenChunk;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; import com.plotsquared.core.generator.GeneratorWrapper;
import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; import com.plotsquared.core.generator.IndependentPlotGenerator;
import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper; import com.plotsquared.core.location.ChunkWrapper;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SingleWorldGenerator; import com.plotsquared.core.generator.SingleWorldGenerator;
import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; import com.plotsquared.core.util.ChunkManager;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; import com.plotsquared.core.queue.ScopedLocalBlockQueue;
import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector2;
import lombok.Getter; import lombok.Getter;
import org.bukkit.World; import org.bukkit.World;

18
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java → Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java
View File

@ -23,16 +23,16 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.generator; package com.plotsquared.bukkit.generator;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; import com.plotsquared.core.generator.IndependentPlotGenerator;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.plotsquared.core.plot.PlotId;
import com.github.intellectualsites.plotsquared.plot.util.MathMan; import com.plotsquared.core.util.MathMan;
import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; import com.plotsquared.core.queue.ScopedLocalBlockQueue;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import java.util.Random; import java.util.Random;
import org.bukkit.World; import org.bukkit.World;

20
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java → Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java
View File

@ -23,16 +23,16 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.listeners; package com.plotsquared.bukkit.listener;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.core.configuration.Settings;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefClass; import com.plotsquared.core.util.ReflectionUtils.RefClass;
import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefField; import com.plotsquared.core.util.ReflectionUtils.RefField;
import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefMethod; import com.plotsquared.core.util.ReflectionUtils.RefMethod;
import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;
@ -55,7 +55,7 @@ import org.bukkit.event.world.ChunkUnloadEvent;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.HashSet; import java.util.HashSet;
import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass; import static com.plotsquared.core.util.ReflectionUtils.getRefClass;
@SuppressWarnings("unused") public class ChunkListener implements Listener { @SuppressWarnings("unused") public class ChunkListener implements Listener {

16
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java → Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java
View File

@ -23,15 +23,15 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.listeners; package com.plotsquared.bukkit.listener;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.core.configuration.Settings;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.core.plot.PlotArea;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.World; import org.bukkit.World;

18
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java → Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java
View File

@ -23,16 +23,16 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.listeners; package com.plotsquared.bukkit.listener;
import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; import com.plotsquared.bukkit.player.BukkitPlayer;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.ForcefieldFlag; import com.plotsquared.core.plot.flag.implementations.ForcefieldFlag;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;

156
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java → Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
View File

@ -23,86 +23,86 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.listeners; package com.plotsquared.bukkit.listener;
import com.destroystokyo.paper.MaterialTags; import com.destroystokyo.paper.MaterialTags;
import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; import com.plotsquared.bukkit.player.BukkitPlayer;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.github.intellectualsites.plotsquared.bukkit.util.UpdateUtility; import com.plotsquared.bukkit.util.UpdateUtility;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.core.configuration.Settings;
import com.github.intellectualsites.plotsquared.plot.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnimalAttackFlag; import com.plotsquared.core.plot.flag.implementations.AnimalAttackFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnimalCapFlag; import com.plotsquared.core.plot.flag.implementations.AnimalCapFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnimalInteractFlag; import com.plotsquared.core.plot.flag.implementations.AnimalInteractFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.BlockBurnFlag; import com.plotsquared.core.plot.flag.implementations.BlockBurnFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.BlockIgnitionFlag; import com.plotsquared.core.plot.flag.implementations.BlockIgnitionFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.BlockedCmdsFlag; import com.plotsquared.core.plot.flag.implementations.BlockedCmdsFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.BreakFlag; import com.plotsquared.core.plot.flag.implementations.BreakFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.CoralDryFlag; import com.plotsquared.core.plot.flag.implementations.CoralDryFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.DenyTeleportFlag; import com.plotsquared.core.plot.flag.implementations.DenyTeleportFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.DisablePhysicsFlag; import com.plotsquared.core.plot.flag.implementations.DisablePhysicsFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.DropProtectionFlag; import com.plotsquared.core.plot.flag.implementations.DropProtectionFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.EntityCapFlag; import com.plotsquared.core.plot.flag.implementations.EntityCapFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.ExplosionFlag; import com.plotsquared.core.plot.flag.implementations.ExplosionFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.GrassGrowFlag; import com.plotsquared.core.plot.flag.implementations.GrassGrowFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.HangingBreakFlag; import com.plotsquared.core.plot.flag.implementations.HangingBreakFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.HangingPlaceFlag; import com.plotsquared.core.plot.flag.implementations.HangingPlaceFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.HostileAttackFlag; import com.plotsquared.core.plot.flag.implementations.HostileAttackFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.HostileCapFlag; import com.plotsquared.core.plot.flag.implementations.HostileCapFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.HostileInteractFlag; import com.plotsquared.core.plot.flag.implementations.HostileInteractFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.IceFormFlag; import com.plotsquared.core.plot.flag.implementations.IceFormFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.IceMeltFlag; import com.plotsquared.core.plot.flag.implementations.IceMeltFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.InstabreakFlag; import com.plotsquared.core.plot.flag.implementations.InstabreakFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.InvincibleFlag; import com.plotsquared.core.plot.flag.implementations.InvincibleFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.ItemDropFlag; import com.plotsquared.core.plot.flag.implementations.ItemDropFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.KelpGrowFlag; import com.plotsquared.core.plot.flag.implementations.KelpGrowFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.LiquidFlowFlag; import com.plotsquared.core.plot.flag.implementations.LiquidFlowFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.MiscBreakFlag; import com.plotsquared.core.plot.flag.implementations.MiscBreakFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.MiscCapFlag; import com.plotsquared.core.plot.flag.implementations.MiscCapFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.MiscInteractFlag; import com.plotsquared.core.plot.flag.implementations.MiscInteractFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.MobCapFlag; import com.plotsquared.core.plot.flag.implementations.MobCapFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.MobPlaceFlag; import com.plotsquared.core.plot.flag.implementations.MobPlaceFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.MycelGrowFlag; import com.plotsquared.core.plot.flag.implementations.MycelGrowFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.PlaceFlag; import com.plotsquared.core.plot.flag.implementations.PlaceFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.PlayerInteractFlag; import com.plotsquared.core.plot.flag.implementations.PlayerInteractFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.PveFlag; import com.plotsquared.core.plot.flag.implementations.PveFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.PvpFlag; import com.plotsquared.core.plot.flag.implementations.PvpFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.RedstoneFlag; import com.plotsquared.core.plot.flag.implementations.RedstoneFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.SnowFormFlag; import com.plotsquared.core.plot.flag.implementations.SnowFormFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.SnowMeltFlag; import com.plotsquared.core.plot.flag.implementations.SnowMeltFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.SoilDryFlag; import com.plotsquared.core.plot.flag.implementations.SoilDryFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.TamedAttackFlag; import com.plotsquared.core.plot.flag.implementations.TamedAttackFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.TamedInteractFlag; import com.plotsquared.core.plot.flag.implementations.TamedInteractFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.UntrustedVisitFlag; import com.plotsquared.core.plot.flag.implementations.UntrustedVisitFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.UseFlag; import com.plotsquared.core.plot.flag.implementations.UseFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.VehicleBreakFlag; import com.plotsquared.core.plot.flag.implementations.VehicleBreakFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.VehicleCapFlag; import com.plotsquared.core.plot.flag.implementations.VehicleCapFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.VehicleUseFlag; import com.plotsquared.core.plot.flag.implementations.VehicleUseFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.VillagerInteractFlag; import com.plotsquared.core.plot.flag.implementations.VillagerInteractFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.VineGrowFlag; import com.plotsquared.core.plot.flag.implementations.VineGrowFlag;
import com.github.intellectualsites.plotsquared.plot.flags.types.BlockTypeWrapper; import com.plotsquared.core.plot.flag.types.BlockTypeWrapper;
import com.github.intellectualsites.plotsquared.plot.listener.PlayerBlockEventType; import com.plotsquared.core.listener.PlayerBlockEventType;
import com.github.intellectualsites.plotsquared.plot.listener.PlotListener; import com.plotsquared.core.listener.PlotListener;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.PlotHandler; import com.plotsquared.core.plot.PlotHandler;
import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.plotsquared.core.plot.PlotId;
import com.github.intellectualsites.plotsquared.plot.object.PlotInventory; import com.plotsquared.core.plot.PlotInventory;
import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; import com.plotsquared.core.plot.message.PlotMessage;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; import com.plotsquared.core.util.StringWrapper;
import com.github.intellectualsites.plotsquared.plot.util.EntityUtil; import com.plotsquared.core.util.EntityUtil;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.MathMan; import com.plotsquared.core.util.MathMan;
import com.github.intellectualsites.plotsquared.plot.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.github.intellectualsites.plotsquared.plot.util.RegExUtil; import com.plotsquared.core.util.RegExUtil;
import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import com.plotsquared.core.util.entity.EntityCategories;
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import com.plotsquared.core.util.task.TaskManager;
import com.github.intellectualsites.plotsquared.plot.util.entity.EntityCategories; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.world.block.BlockType; import com.sk89q.worldedit.world.block.BlockType;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;

12
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java → Bukkit/src/main/java/com/plotsquared/bukkit/listener/SingleWorldListener.java
View File

@ -23,12 +23,12 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.listeners; package com.plotsquared.bukkit.listener;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; import com.plotsquared.core.plot.world.PlotAreaManager;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; import com.plotsquared.core.plot.world.SinglePlotAreaManager;
import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils; import com.plotsquared.core.util.ReflectionUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.World; import org.bukkit.World;
@ -42,7 +42,7 @@ import org.bukkit.plugin.Plugin;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass; import static com.plotsquared.core.util.ReflectionUtils.getRefClass;
@SuppressWarnings("unused") public class SingleWorldListener implements Listener { @SuppressWarnings("unused") public class SingleWorldListener implements Listener {

12
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/WorldEvents.java → Bukkit/src/main/java/com/plotsquared/bukkit/listener/WorldEvents.java
View File

@ -23,13 +23,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.listeners; package com.plotsquared.bukkit.listener;
import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator; import com.plotsquared.bukkit.generator.BukkitPlotGenerator;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; import com.plotsquared.core.generator.GeneratorWrapper;
import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; import com.plotsquared.core.plot.world.PlotAreaManager;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; import com.plotsquared.core.plot.world.SinglePlotAreaManager;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;

8
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/placeholders/PlaceholderFormatter.java → Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PlaceholderFormatter.java
View File

@ -23,11 +23,11 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.placeholders; package com.plotsquared.bukkit.placeholder;
import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; import com.plotsquared.bukkit.player.BukkitPlayer;
import com.github.intellectualsites.plotsquared.plot.config.ChatFormatter; import com.plotsquared.core.configuration.ChatFormatter;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.PlaceholderAPI;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

10
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/placeholders/Placeholders.java → Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/Placeholders.java
View File

@ -23,12 +23,12 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.placeholders; package com.plotsquared.bukkit.placeholder;
import com.github.intellectualsites.plotsquared.bukkit.BukkitMain; import com.plotsquared.bukkit.BukkitMain;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import me.clip.placeholderapi.PlaceholderAPIPlugin; import me.clip.placeholderapi.PlaceholderAPIPlugin;
import me.clip.placeholderapi.expansion.PlaceholderExpansion; import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

4
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitOfflinePlayer.java → Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java
View File

@ -23,9 +23,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.object; package com.plotsquared.bukkit.player;
import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; import com.plotsquared.core.player.OfflinePlotPlayer;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

24
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java → Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
View File

@ -23,19 +23,19 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.object; package com.plotsquared.bukkit.player;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; import com.plotsquared.core.events.TeleportCause;
import com.github.intellectualsites.plotsquared.plot.util.EconHandler; import com.plotsquared.core.util.EconHandler;
import com.github.intellectualsites.plotsquared.plot.util.MathMan; import com.plotsquared.core.util.MathMan;
import com.github.intellectualsites.plotsquared.plot.util.PlotWeather; import com.plotsquared.core.plot.PlotWeather;
import com.github.intellectualsites.plotsquared.plot.util.StringMan; import com.plotsquared.core.util.StringMan;
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.world.item.ItemType; import com.sk89q.worldedit.world.item.ItemType;

14
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java → Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java
View File

@ -23,14 +23,14 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.util.block; package com.plotsquared.bukkit.queue;
import com.github.intellectualsites.plotsquared.bukkit.object.BukkitBlockUtil; import com.plotsquared.bukkit.schematic.StateWrapper;
import com.github.intellectualsites.plotsquared.bukkit.object.schematic.StateWrapper; import com.plotsquared.bukkit.util.BukkitBlockUtil;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.block.BasicLocalBlockQueue; import com.plotsquared.core.queue.BasicLocalBlockQueue;
import com.github.intellectualsites.plotsquared.plot.util.world.BlockUtil; import com.plotsquared.core.util.BlockUtil;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;

16
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java → Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java
View File

@ -23,15 +23,15 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.util.block; package com.plotsquared.bukkit.queue;
import com.github.intellectualsites.plotsquared.bukkit.object.BukkitBlockUtil; import com.plotsquared.bukkit.util.BukkitBlockUtil;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper; import com.plotsquared.core.location.ChunkWrapper;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; import com.plotsquared.core.queue.ScopedLocalBlockQueue;
import com.github.intellectualsites.plotsquared.plot.util.world.PatternUtil; import com.plotsquared.core.util.PatternUtil;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;

16
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSchematicHandler.java → Bukkit/src/main/java/com/plotsquared/bukkit/schematic/BukkitSchematicHandler.java
View File

@ -23,15 +23,15 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.util; package com.plotsquared.bukkit.schematic;
import com.github.intellectualsites.plotsquared.bukkit.object.schematic.StateWrapper; import com.plotsquared.bukkit.util.BukkitUtil;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; import com.plotsquared.core.util.task.RunnableVal;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; import com.plotsquared.core.util.SchematicHandler;
import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; import com.plotsquared.core.queue.LocalBlockQueue;
import com.sk89q.jnbt.*; import com.sk89q.jnbt.*;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.extension.platform.Capability; import com.sk89q.worldedit.extension.platform.Capability;

8
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java → Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java
View File

@ -23,11 +23,11 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.object.schematic; package com.plotsquared.bukkit.schematic;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.Captions;
import com.sk89q.jnbt.ByteTag; import com.sk89q.jnbt.ByteTag;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.ListTag; import com.sk89q.jnbt.ListTag;

2
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitBlockUtil.java → Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitBlockUtil.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.object; package com.plotsquared.bukkit.util;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockState;

18
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java → Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java
View File

@ -23,16 +23,16 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.util; package com.plotsquared.bukkit.util;
import com.github.intellectualsites.plotsquared.bukkit.chat.FancyMessage; import com.plotsquared.bukkit.chat.FancyMessage;
import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; import com.plotsquared.bukkit.player.BukkitPlayer;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.core.configuration.Settings;
import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer; import com.plotsquared.core.player.ConsolePlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; import com.plotsquared.core.plot.message.PlotMessage;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.util.ChatManager; import com.plotsquared.core.util.ChatManager;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import java.util.Arrays; import java.util.Arrays;

12
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEconHandler.java → Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java
View File

@ -23,13 +23,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.util; package com.plotsquared.bukkit.util;
import com.github.intellectualsites.plotsquared.bukkit.object.BukkitOfflinePlayer; import com.plotsquared.bukkit.player.BukkitOfflinePlayer;
import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; import com.plotsquared.bukkit.player.BukkitPlayer;
import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; import com.plotsquared.core.player.OfflinePlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.util.EconHandler; import com.plotsquared.core.util.EconHandler;
import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.permission.Permission; import net.milkbowl.vault.permission.Permission;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

12
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java → Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java
View File

@ -23,13 +23,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.util; package com.plotsquared.bukkit.util;
import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; import com.plotsquared.bukkit.player.BukkitPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotInventory; import com.plotsquared.core.plot.PlotInventory;
import com.github.intellectualsites.plotsquared.plot.object.PlotItemStack; import com.plotsquared.core.plot.PlotItemStack;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.util.InventoryUtil; import com.plotsquared.core.util.InventoryUtil;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;

22
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java → Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java
View File

@ -23,18 +23,18 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.util; package com.plotsquared.bukkit.util;
import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator; import com.plotsquared.bukkit.generator.BukkitPlotGenerator;
import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; import com.plotsquared.core.configuration.ConfigurationSection;
import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; import com.plotsquared.core.configuration.file.YamlConfiguration;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; import com.plotsquared.core.configuration.ConfigurationNode;
import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; import com.plotsquared.core.generator.GeneratorWrapper;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; import com.plotsquared.core.plot.PlotAreaType;
import com.github.intellectualsites.plotsquared.plot.object.SetupObject; import com.plotsquared.core.plot.SetupObject;
import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; import com.plotsquared.core.util.SetupUtils;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;

6
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitTaskManager.java → Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitTaskManager.java
View File

@ -23,10 +23,10 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.util; package com.plotsquared.bukkit.util;
import com.github.intellectualsites.plotsquared.bukkit.BukkitMain; import com.plotsquared.bukkit.BukkitMain;
import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
public class BukkitTaskManager extends TaskManager { public class BukkitTaskManager extends TaskManager {

33
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java → Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
View File

@ -23,23 +23,23 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.util; package com.plotsquared.bukkit.util;
import com.github.intellectualsites.plotsquared.bukkit.BukkitMain; import com.plotsquared.bukkit.BukkitMain;
import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; import com.plotsquared.bukkit.player.BukkitPlayer;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; import com.plotsquared.core.util.task.RunnableVal;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.MathMan; import com.plotsquared.core.util.MathMan;
import com.github.intellectualsites.plotsquared.plot.util.StringComparison; import com.plotsquared.core.util.StringComparison;
import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; import com.plotsquared.core.util.WorldUtil;
import com.github.intellectualsites.plotsquared.plot.util.world.BlockUtil; import com.plotsquared.core.util.BlockUtil;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.BukkitWorld; import com.sk89q.worldedit.bukkit.BukkitWorld;
import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.CuboidRegion;
@ -101,7 +101,6 @@ import java.util.UUID;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.IntConsumer; import java.util.function.IntConsumer;
@SuppressWarnings({"unused", "WeakerAccess"}) @SuppressWarnings({"unused", "WeakerAccess"})
public class BukkitUtil extends WorldUtil { public class BukkitUtil extends WorldUtil {

20
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/OfflinePlayerUtil.java → Bukkit/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.util; package com.plotsquared.bukkit.util;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
@ -34,15 +34,15 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.UUID; import java.util.UUID;
import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.callConstructor; import static com.plotsquared.core.util.ReflectionUtils.callConstructor;
import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.callMethod; import static com.plotsquared.core.util.ReflectionUtils.callMethod;
import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getCbClass; import static com.plotsquared.core.util.ReflectionUtils.getCbClass;
import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getField; import static com.plotsquared.core.util.ReflectionUtils.getField;
import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getNmsClass; import static com.plotsquared.core.util.ReflectionUtils.getNmsClass;
import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getUtilClass; import static com.plotsquared.core.util.ReflectionUtils.getUtilClass;
import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.makeConstructor; import static com.plotsquared.core.util.ReflectionUtils.makeConstructor;
import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.makeField; import static com.plotsquared.core.util.ReflectionUtils.makeField;
import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.makeMethod; import static com.plotsquared.core.util.ReflectionUtils.makeMethod;
public class OfflinePlayerUtil { public class OfflinePlayerUtil {

26
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java → Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java
View File

@ -23,19 +23,19 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.util; package com.plotsquared.bukkit.util;
import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; import com.plotsquared.bukkit.player.BukkitPlayer;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefClass; import com.plotsquared.core.util.ReflectionUtils.RefClass;
import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefConstructor; import com.plotsquared.core.util.ReflectionUtils.RefConstructor;
import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefField; import com.plotsquared.core.util.ReflectionUtils.RefField;
import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefMethod; import com.plotsquared.core.util.ReflectionUtils.RefMethod;
import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector2;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -49,7 +49,7 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map.Entry; import java.util.Map.Entry;
import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass; import static com.plotsquared.core.util.ReflectionUtils.getRefClass;
/** /**
* An utility that can be used to send chunks, rather than using bukkit code * An utility that can be used to send chunks, rather than using bukkit code

10
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SetGenCB.java → Bukkit/src/main/java/com/plotsquared/bukkit/util/SetGenCB.java
View File

@ -23,12 +23,12 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.util; package com.plotsquared.bukkit.util;
import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitAugmentedGenerator; import com.plotsquared.bukkit.generator.BukkitAugmentedGenerator;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; import com.plotsquared.core.generator.GeneratorWrapper;
import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; import com.plotsquared.core.util.SetupUtils;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.generator.ChunkGenerator; import org.bukkit.generator.ChunkGenerator;

13
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/UpdateUtility.java → Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java
View File

@ -23,11 +23,11 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.util; package com.plotsquared.bukkit.util;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.core.configuration.Settings;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
@ -60,7 +60,8 @@ public class UpdateUtility implements Listener {
connection.setRequestMethod("GET"); connection.setRequestMethod("GET");
spigotVersion = (new BufferedReader(new InputStreamReader(connection.getInputStream()))).readLine(); spigotVersion = (new BufferedReader(new InputStreamReader(connection.getInputStream()))).readLine();
} catch (IOException e) { } catch (IOException e) {
PlotSquared.log(Captions.PREFIX + "&cUnable to check for updates because: " + e); PlotSquared.log(
Captions.PREFIX + "&cUnable to check for updates because: " + e);
this.cancel(); this.cancel();
return; return;
} }
@ -78,4 +79,4 @@ public class UpdateUtility implements Listener {
} }
}.runTaskTimer(this.javaPlugin, 0L, 12000L); }.runTaskTimer(this.javaPlugin, 0L, 12000L);
} }
} }

2
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DatFileFilter.java → Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/DatFileFilter.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.uuid; package com.plotsquared.bukkit.util.uuid;
import java.io.File; import java.io.File;
import java.io.FilenameFilter; import java.io.FilenameFilter;

12
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java → Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/DefaultUUIDWrapper.java
View File

@ -23,13 +23,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.uuid; package com.plotsquared.bukkit.util.uuid;
import com.github.intellectualsites.plotsquared.bukkit.object.BukkitOfflinePlayer; import com.plotsquared.bukkit.player.BukkitOfflinePlayer;
import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; import com.plotsquared.bukkit.player.BukkitPlayer;
import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; import com.plotsquared.core.player.OfflinePlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; import com.plotsquared.core.util.uuid.UUIDWrapper;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

33
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java → Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/FileUUIDHandler.java
View File

@ -23,32 +23,29 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.uuid; package com.plotsquared.bukkit.util.uuid;
import com.github.intellectualsites.plotsquared.plot.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Settings;
import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
import com.github.intellectualsites.plotsquared.plot.object.StringWrapper;
import com.github.intellectualsites.plotsquared.plot.util.StringMan;
import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandlerImplementation;
import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
import com.google.common.collect.HashBiMap; import com.google.common.collect.HashBiMap;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.player.OfflinePlotPlayer;
import com.plotsquared.core.plot.expiration.ExpireManager;
import com.plotsquared.core.util.StringMan;
import com.plotsquared.core.util.StringWrapper;
import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.core.util.uuid.UUIDHandler;
import com.plotsquared.core.util.uuid.UUIDHandlerImplementation;
import com.plotsquared.core.util.uuid.UUIDWrapper;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.NBTInputStream; import com.sk89q.jnbt.NBTInputStream;
import com.sk89q.jnbt.Tag; import com.sk89q.jnbt.Tag;
import java.io.BufferedInputStream;
import java.io.FileNotFoundException;
import java.util.Map;
import java.util.zip.GZIPInputStream;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.World; import org.bukkit.World;
import java.io.BufferedInputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
@ -57,7 +54,9 @@ import java.nio.file.Files;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.zip.GZIPInputStream;
public class FileUUIDHandler extends UUIDHandlerImplementation { public class FileUUIDHandler extends UUIDHandlerImplementation {

6
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java → Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/LowerOfflineUUIDWrapper.java
View File

@ -23,10 +23,10 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.uuid; package com.plotsquared.bukkit.util.uuid;
import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; import com.plotsquared.core.player.OfflinePlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

16
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java → Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/OfflineUUIDWrapper.java
View File

@ -23,15 +23,15 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.uuid; package com.plotsquared.bukkit.util.uuid;
import com.github.intellectualsites.plotsquared.bukkit.object.BukkitOfflinePlayer; import com.plotsquared.bukkit.player.BukkitOfflinePlayer;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; import com.plotsquared.core.player.OfflinePlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; import com.plotsquared.core.util.StringWrapper;
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; import com.plotsquared.core.util.uuid.UUIDWrapper;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import com.google.common.collect.BiMap; import com.google.common.collect.BiMap;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

24
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java → Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/SQLUUIDHandler.java
View File

@ -23,19 +23,19 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.bukkit.uuid; package com.plotsquared.bukkit.util.uuid;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.core.configuration.Settings;
import com.github.intellectualsites.plotsquared.plot.database.SQLite; import com.plotsquared.core.database.SQLite;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; import com.plotsquared.core.util.task.RunnableVal;
import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; import com.plotsquared.core.util.StringWrapper;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandlerImplementation; import com.plotsquared.core.util.uuid.UUIDHandlerImplementation;
import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; import com.plotsquared.core.util.uuid.UUIDWrapper;
import com.google.common.collect.HashBiMap; import com.google.common.collect.HashBiMap;
import org.json.simple.JSONArray; import org.json.simple.JSONArray;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;

2
Bukkit/src/main/resources/plugin.yml
View File

@ -1,5 +1,5 @@
name: ${name} name: ${name}
main: com.github.intellectualsites.plotsquared.bukkit.BukkitMain main: com.plotsquared.bukkit.BukkitMain
api-version: "1.13" api-version: "1.13"
version: "${version}" version: "${version}"
load: STARTUP load: STARTUP

14
Core/build.gradle
View File

@ -35,7 +35,7 @@ processResources {
//noinspection GroovyAssignabilityCheck //noinspection GroovyAssignabilityCheck
jar.archiveFileName = "PlotSquared-${project.parent.version}.jar" jar.archiveFileName = "PlotSquared-${project.parent.version}.jar"
jar.destinationDirectory = file("../mvn/com/github/intellectualsites/plotsquared/PlotSquared/" + project.parent.version) jar.destinationDirectory = file("../mvn/com/plotsquared/PlotSquared/" + project.parent.version)
task createPom { task createPom {
doLast { doLast {
pom { pom {
@ -44,14 +44,14 @@ task createPom {
artifactId = "PlotSquared" artifactId = "PlotSquared"
version = project.parent.version version = project.parent.version
} }
}.writeTo("../mvn/com/github/intellectualsites/plotsquared/PlotSquared/${project.parent.version}/PlotSquared-${project.parent.version}.pom") }.writeTo("../mvn/com/plotsquared/PlotSquared/${project.parent.version}/PlotSquared-${project.parent.version}.pom")
pom { pom {
project { project {
groupId = rootProject.group groupId = rootProject.group
artifactId = "PlotSquared" artifactId = "PlotSquared"
version = "latest" version = "latest"
} }
}.writeTo("../mvn/com/github/intellectualsites/plotsquared/PlotSquared/latest/PlotSquared-latest.pom") }.writeTo("../mvn/com/plotsquared/PlotSquared/latest/PlotSquared-latest.pom")
.writeTo("pom.xml") .writeTo("pom.xml")
} }
} }
@ -59,8 +59,8 @@ task createPom {
task copyFiles { task copyFiles {
doLast { doLast {
copy { copy {
from("../mvn/com/github/intellectualsites/plotsquared/PlotSquared/${project.parent.version}/") from("../mvn/com/plotsquared/PlotSquared/${project.parent.version}/")
into("../mvn/com/github/intellectualsites/plotsquared/PlotSquared/latest/") into("../mvn/com/plotsquared/PlotSquared/latest/")
include("*.jar") include("*.jar")
rename("PlotSquared-${project.parent.version}.jar", "PlotSquared-latest.jar") rename("PlotSquared-${project.parent.version}.jar", "PlotSquared-latest.jar")
} }
@ -74,8 +74,8 @@ shadowJar {
include(dependency("net.kyori:text-serializer-legacy:3.0.2")) include(dependency("net.kyori:text-serializer-legacy:3.0.2"))
include(dependency("net.kyori:text-serializer-plain:3.0.2")) include(dependency("net.kyori:text-serializer-plain:3.0.2"))
} }
relocate("org.json", "com.github.intellectualsites.plotsquared.json") relocate('net.kyori.text', 'com.plotsquared.formatting.text')
relocate('net.kyori.text', 'com.github.intellectualsites.plotsquared.formatting.text') relocate("org.json", "com.plotsquared.json")
} }
shadowJar.doLast { shadowJar.doLast {

2
Core/pom.xml
View File

@ -2,7 +2,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.github.intellectualsites.plotsquared</groupId> <groupId>com.plotsquared</groupId>
<artifactId>PlotSquared</artifactId> <artifactId>PlotSquared</artifactId>
<version>latest</version> <version>latest</version>
<dependencies> <dependencies>

29
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpirySettings.java
View File

@ -1,29 +0,0 @@
/*
* _____ _ _ _____ _
* | __ \| | | | / ____| | |
* | |__) | | ___ | |_| (___ __ _ _ _ __ _ _ __ ___ __| |
* | ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
* | | | | (_) | |_ ____) | (_| | |_| | (_| | | | __/ (_| |
* |_| |_|\___/ \__|_____/ \__, |\__,_|\__,_|_| \___|\__,_|
* | |
* |_|
* PlotSquared plot management system for Minecraft
* Copyright (C) 2020 IntellectualSites
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.github.intellectualsites.plotsquared.plot.util.expiry;
public class ExpirySettings {
}

32
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java → Core/src/main/java/com/plotsquared/core/IPlotMain.java
View File

@ -23,23 +23,23 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot; package com.plotsquared.core;
import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; import com.plotsquared.core.generator.GeneratorWrapper;
import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; import com.plotsquared.core.generator.HybridUtils;
import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; import com.plotsquared.core.generator.IndependentPlotGenerator;
import com.github.intellectualsites.plotsquared.plot.logger.ILogger; import com.plotsquared.core.util.logger.ILogger;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.util.ChatManager; import com.plotsquared.core.util.ChatManager;
import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; import com.plotsquared.core.util.ChunkManager;
import com.github.intellectualsites.plotsquared.plot.util.EconHandler; import com.plotsquared.core.util.EconHandler;
import com.github.intellectualsites.plotsquared.plot.util.InventoryUtil; import com.plotsquared.core.util.InventoryUtil;
import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; import com.plotsquared.core.util.SchematicHandler;
import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; import com.plotsquared.core.util.SetupUtils;
import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandlerImplementation; import com.plotsquared.core.util.uuid.UUIDHandlerImplementation;
import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; import com.plotsquared.core.util.WorldUtil;
import com.github.intellectualsites.plotsquared.plot.util.block.QueueProvider; import com.plotsquared.core.queue.QueueProvider;
import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Actor;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java → Core/src/main/java/com/plotsquared/core/Platform.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot; package com.plotsquared.core;
public enum Platform { public enum Platform {
Bukkit, Sponge, Spigot, Paper Bukkit, Sponge, Spigot, Paper

137
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java → Core/src/main/java/com/plotsquared/core/PlotSquared.java
View File

@ -23,39 +23,65 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot; package com.plotsquared.core;
import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; import com.plotsquared.core.command.WE_Anywhere;
import com.github.intellectualsites.plotsquared.configuration.MemorySection; import com.plotsquared.core.configuration.Caption;
import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; import com.plotsquared.core.configuration.CaptionUtility;
import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerialization; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.commands.WE_Anywhere; import com.plotsquared.core.configuration.ConfigurationUtil;
import com.github.intellectualsites.plotsquared.plot.config.Caption; import com.plotsquared.core.configuration.Settings;
import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; import com.plotsquared.core.configuration.Storage;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.ConfigurationSection;
import com.github.intellectualsites.plotsquared.plot.config.Configuration; import com.plotsquared.core.configuration.MemorySection;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.core.configuration.file.YamlConfiguration;
import com.github.intellectualsites.plotsquared.plot.config.Storage; import com.plotsquared.core.configuration.serialization.ConfigurationSerialization;
import com.github.intellectualsites.plotsquared.plot.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.github.intellectualsites.plotsquared.plot.database.Database; import com.plotsquared.core.database.Database;
import com.github.intellectualsites.plotsquared.plot.database.MySQL; import com.plotsquared.core.database.MySQL;
import com.github.intellectualsites.plotsquared.plot.database.SQLManager; import com.plotsquared.core.database.SQLManager;
import com.github.intellectualsites.plotsquared.plot.database.SQLite; import com.plotsquared.core.database.SQLite;
import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; import com.plotsquared.core.generator.GeneratorWrapper;
import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld; import com.plotsquared.core.generator.HybridPlotWorld;
import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; import com.plotsquared.core.generator.HybridUtils;
import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; import com.plotsquared.core.generator.IndependentPlotGenerator;
import com.github.intellectualsites.plotsquared.plot.listener.WESubscriber; import com.plotsquared.core.listener.WESubscriber;
import com.github.intellectualsites.plotsquared.plot.logger.ILogger; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.*; import com.plotsquared.core.player.ConsolePlayer;
import com.github.intellectualsites.plotsquared.plot.object.worlds.DefaultPlotAreaManager; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; import com.plotsquared.core.plot.BlockBucket;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; import com.plotsquared.core.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.util.*; import com.plotsquared.core.plot.PlotAreaType;
import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; import com.plotsquared.core.plot.PlotCluster;
import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; import com.plotsquared.core.plot.PlotFilter;
import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpiryTask; import com.plotsquared.core.plot.PlotId;
import com.plotsquared.core.plot.PlotManager;
import com.plotsquared.core.plot.comment.CommentManager;
import com.plotsquared.core.plot.expiration.ExpireManager;
import com.plotsquared.core.plot.expiration.ExpiryTask;
import com.plotsquared.core.plot.world.DefaultPlotAreaManager;
import com.plotsquared.core.plot.world.PlotAreaManager;
import com.plotsquared.core.plot.world.SinglePlotArea;
import com.plotsquared.core.plot.world.SinglePlotAreaManager;
import com.plotsquared.core.queue.GlobalBlockQueue;
import com.plotsquared.core.util.ChatManager;
import com.plotsquared.core.util.ChunkManager;
import com.plotsquared.core.util.EconHandler;
import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.InventoryUtil;
import com.plotsquared.core.util.LegacyConverter;
import com.plotsquared.core.util.MainUtil;
import com.plotsquared.core.util.MathMan;
import com.plotsquared.core.util.ReflectionUtils;
import com.plotsquared.core.util.SchematicHandler;
import com.plotsquared.core.util.SetupUtils;
import com.plotsquared.core.util.StringMan;
import com.plotsquared.core.util.StringWrapper;
import com.plotsquared.core.util.WorldUtil;
import com.plotsquared.core.util.logger.ILogger;
import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.core.util.uuid.UUIDHandler;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.CuboidRegion;
@ -64,15 +90,37 @@ import lombok.NonNull;
import lombok.Setter; import lombok.Setter;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.io.*; import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.StandardOpenOption; import java.nio.file.StandardOpenOption;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.*; import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import java.util.UUID;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -1401,41 +1449,41 @@ import java.util.zip.ZipInputStream;
case "s": case "s":
case "size": case "size":
this.worlds.set(base + "plot.size", this.worlds.set(base + "plot.size",
Configuration.INTEGER.parseString(value).shortValue()); ConfigurationUtil.INTEGER.parseString(value).shortValue());
break; break;
case "g": case "g":
case "gap": case "gap":
this.worlds.set(base + "road.width", this.worlds.set(base + "road.width",
Configuration.INTEGER.parseString(value).shortValue()); ConfigurationUtil.INTEGER.parseString(value).shortValue());
break; break;
case "h": case "h":
case "height": case "height":
this.worlds.set(base + "road.height", this.worlds.set(base + "road.height",
Configuration.INTEGER.parseString(value).shortValue()); ConfigurationUtil.INTEGER.parseString(value).shortValue());
this.worlds.set(base + "plot.height", this.worlds.set(base + "plot.height",
Configuration.INTEGER.parseString(value).shortValue()); ConfigurationUtil.INTEGER.parseString(value).shortValue());
this.worlds.set(base + "wall.height", this.worlds.set(base + "wall.height",
Configuration.INTEGER.parseString(value).shortValue()); ConfigurationUtil.INTEGER.parseString(value).shortValue());
break; break;
case "f": case "f":
case "floor": case "floor":
this.worlds.set(base + "plot.floor", this.worlds.set(base + "plot.floor",
Configuration.BLOCK_BUCKET.parseString(value).toString()); ConfigurationUtil.BLOCK_BUCKET.parseString(value).toString());
break; break;
case "m": case "m":
case "main": case "main":
this.worlds.set(base + "plot.filling", this.worlds.set(base + "plot.filling",
Configuration.BLOCK_BUCKET.parseString(value).toString()); ConfigurationUtil.BLOCK_BUCKET.parseString(value).toString());
break; break;
case "w": case "w":
case "wall": case "wall":
this.worlds.set(base + "wall.filling", this.worlds.set(base + "wall.filling",
Configuration.BLOCK_BUCKET.parseString(value).toString()); ConfigurationUtil.BLOCK_BUCKET.parseString(value).toString());
break; break;
case "b": case "b":
case "border": case "border":
this.worlds.set(base + "wall.block", this.worlds.set(base + "wall.block",
Configuration.BLOCK_BUCKET.parseString(value).toString()); ConfigurationUtil.BLOCK_BUCKET.parseString(value).toString());
break; break;
default: default:
PlotSquared.log("&cKey not found: &7" + element); PlotSquared.log("&cKey not found: &7" + element);
@ -1720,7 +1768,8 @@ import java.util.zip.ZipInputStream;
if (this.worlds.contains("worlds")) { if (this.worlds.contains("worlds")) {
if (!this.worlds.contains("configuration_version") || if (!this.worlds.contains("configuration_version") ||
(!this.worlds.getString("configuration_version").equalsIgnoreCase(LegacyConverter.CONFIGURATION_VERSION) && (!this.worlds.getString("configuration_version").equalsIgnoreCase(
LegacyConverter.CONFIGURATION_VERSION) &&
!this.worlds.getString("configuration_version").equalsIgnoreCase("v5"))) { !this.worlds.getString("configuration_version").equalsIgnoreCase("v5"))) {
// Conversion needed // Conversion needed
log(Captions.LEGACY_CONFIG_FOUND.getTranslated()); log(Captions.LEGACY_CONFIG_FOUND.getTranslated());

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java → Core/src/main/java/com/plotsquared/core/PlotVersion.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot; package com.plotsquared.core;
public class PlotVersion { public class PlotVersion {
public final int year, month, day, hash, build; public final int year, month, day, hash, build;

31
Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java → Core/src/main/java/com/plotsquared/core/api/PlotAPI.java
View File

@ -23,18 +23,23 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.api; package com.plotsquared.core.api;
import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; import com.plotsquared.core.configuration.file.YamlConfiguration;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Caption; import com.plotsquared.core.configuration.Caption;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.util.*; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; import com.plotsquared.core.queue.GlobalBlockQueue;
import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; import com.plotsquared.core.util.ChunkManager;
import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.MainUtil;
import com.plotsquared.core.util.SchematicHandler;
import com.plotsquared.core.util.uuid.UUIDHandler;
import com.plotsquared.core.util.uuid.UUIDWrapper;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.util.Collections; import java.util.Collections;
@ -48,12 +53,12 @@ import java.util.UUID;
* <ul> * <ul>
* <li>{@link PlotPlayer}</li> * <li>{@link PlotPlayer}</li>
* <li>{@link Plot}</li> * <li>{@link Plot}</li>
* <li>{@link com.github.intellectualsites.plotsquared.plot.object.Location}</li> * <li>{@link Location}</li>
* <li>{@link PlotArea}</li> * <li>{@link PlotArea}</li>
* <li>{@link PlotSquared}</li> * <li>{@link PlotSquared}</li>
* </ul> * </ul>
* *
* @version 3.3.3 * @version 5
*/ */
@SuppressWarnings({"unused", "WeakerAccess"}) @NoArgsConstructor public class PlotAPI { @SuppressWarnings({"unused", "WeakerAccess"}) @NoArgsConstructor public class PlotAPI {

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java → Core/src/main/java/com/plotsquared/core/collection/ArrayUtil.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.util; package com.plotsquared.core.collection;
import java.util.Arrays; import java.util.Arrays;

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ByteArrayUtilities.java → Core/src/main/java/com/plotsquared/core/collection/ByteArrayUtilities.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.util; package com.plotsquared.core.collection;
public class ByteArrayUtilities { public class ByteArrayUtilities {

4
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/FlatRandomCollection.java → Core/src/main/java/com/plotsquared/core/collection/FlatRandomCollection.java
View File

@ -23,9 +23,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.object.collection; package com.plotsquared.core.collection;
import com.github.intellectualsites.plotsquared.plot.util.MathMan; import com.plotsquared.core.util.MathMan;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;

4
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/area/QuadMap.java → Core/src/main/java/com/plotsquared/core/collection/QuadMap.java
View File

@ -23,9 +23,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.util.area; package com.plotsquared.core.collection;
import com.github.intellectualsites.plotsquared.plot.util.world.RegionUtil; import com.plotsquared.core.util.RegionUtil;
import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.CuboidRegion;
import java.util.HashSet; import java.util.HashSet;

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/RandomCollection.java → Core/src/main/java/com/plotsquared/core/collection/RandomCollection.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.object.collection; package com.plotsquared.core.collection;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/SimpleRandomCollection.java → Core/src/main/java/com/plotsquared/core/collection/SimpleRandomCollection.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.object.collection; package com.plotsquared.core.collection;
import java.util.Map; import java.util.Map;
import java.util.NavigableMap; import java.util.NavigableMap;

22
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java → Core/src/main/java/com/plotsquared/core/command/Add.java
View File

@ -23,19 +23,17 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.commands.Command; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.database.DBFunc;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.database.DBFunc; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.util.task.RunnableVal2;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.util.task.RunnableVal3;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; import com.plotsquared.core.util.Permissions;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.Permissions;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;

23
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java → Core/src/main/java/com/plotsquared/core/command/Alias.java
View File

@ -23,19 +23,18 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.util.StringWrapper;
import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.MathMan;
import com.github.intellectualsites.plotsquared.plot.util.MathMan; import com.plotsquared.core.util.Permissions;
import com.github.intellectualsites.plotsquared.plot.util.Permissions; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
@CommandDeclaration(command = "setalias", @CommandDeclaration(command = "setalias",
permission = "plots.alias", permission = "plots.alias",

62
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java → Core/src/main/java/com/plotsquared/core/command/Area.java
View File

@ -23,35 +23,33 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.configuration.ConfigurationSection;
import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.ConfigurationUtil;
import com.github.intellectualsites.plotsquared.plot.config.Configuration; import com.plotsquared.core.generator.AugmentedUtils;
import com.github.intellectualsites.plotsquared.plot.generator.AugmentedUtils; import com.plotsquared.core.generator.HybridPlotWorld;
import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.core.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.core.plot.PlotAreaTerrainType;
import com.github.intellectualsites.plotsquared.plot.object.PlotAreaTerrainType; import com.plotsquared.core.plot.PlotAreaType;
import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; import com.plotsquared.core.plot.PlotId;
import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.plotsquared.core.plot.message.PlotMessage;
import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.util.task.RunnableVal;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; import com.plotsquared.core.util.task.RunnableVal3;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; import com.plotsquared.core.plot.SetupObject;
import com.github.intellectualsites.plotsquared.plot.object.SetupObject; import com.plotsquared.core.events.TeleportCause;
import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; import com.plotsquared.core.util.ChunkManager;
import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm; import com.plotsquared.core.util.MathMan;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.Permissions;
import com.github.intellectualsites.plotsquared.plot.util.MathMan; import com.plotsquared.core.util.SetupUtils;
import com.github.intellectualsites.plotsquared.plot.util.Permissions; import com.plotsquared.core.util.StringMan;
import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; import com.plotsquared.core.util.WorldUtil;
import com.github.intellectualsites.plotsquared.plot.util.StringMan; import com.plotsquared.core.util.RegionUtil;
import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
import com.github.intellectualsites.plotsquared.plot.util.world.RegionUtil;
import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.CuboidRegion;
@ -241,20 +239,20 @@ public class Area extends SubCommand {
break; break;
case "f": case "f":
case "floor": case "floor":
pa.TOP_BLOCK = Configuration.BLOCK_BUCKET.parseString(pair[1]); pa.TOP_BLOCK = ConfigurationUtil.BLOCK_BUCKET.parseString(pair[1]);
break; break;
case "m": case "m":
case "main": case "main":
pa.MAIN_BLOCK = Configuration.BLOCK_BUCKET.parseString(pair[1]); pa.MAIN_BLOCK = ConfigurationUtil.BLOCK_BUCKET.parseString(pair[1]);
break; break;
case "w": case "w":
case "wall": case "wall":
pa.WALL_FILLING = pa.WALL_FILLING =
Configuration.BLOCK_BUCKET.parseString(pair[1]); ConfigurationUtil.BLOCK_BUCKET.parseString(pair[1]);
break; break;
case "b": case "b":
case "border": case "border":
pa.WALL_BLOCK = Configuration.BLOCK_BUCKET.parseString(pair[1]); pa.WALL_BLOCK = ConfigurationUtil.BLOCK_BUCKET.parseString(pair[1]);
break; break;
case "terrain": case "terrain":
pa.setTerrain(PlotAreaTerrainType.fromString(pair[1]).orElseThrow(() -> new IllegalArgumentException(pair[1] + " is not a valid terrain."))); pa.setTerrain(PlotAreaTerrainType.fromString(pair[1]).orElseThrow(() -> new IllegalArgumentException(pair[1] + " is not a valid terrain.")));

4
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java → Core/src/main/java/com/plotsquared/core/command/Argument.java
View File

@ -23,9 +23,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.plotsquared.core.plot.PlotId;
public abstract class Argument<T> { public abstract class Argument<T> {

45
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java → Core/src/main/java/com/plotsquared/core/command/Auto.java
View File

@ -23,30 +23,29 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.configuration.CaptionUtility;
import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.Settings;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.core.database.DBFunc;
import com.github.intellectualsites.plotsquared.plot.database.DBFunc; import com.plotsquared.core.events.PlayerAutoPlotEvent;
import com.github.intellectualsites.plotsquared.plot.events.PlayerAutoPlotEvent; import com.plotsquared.core.events.PlotAutoMergeEvent;
import com.github.intellectualsites.plotsquared.plot.events.PlotAutoMergeEvent; import com.plotsquared.core.events.Result;
import com.github.intellectualsites.plotsquared.plot.events.Result; import com.plotsquared.core.util.Expression;
import com.github.intellectualsites.plotsquared.plot.object.Expression; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.core.plot.PlotAreaType;
import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; import com.plotsquared.core.plot.PlotId;
import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.util.task.RunnableVal;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; import com.plotsquared.core.events.TeleportCause;
import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; import com.plotsquared.core.util.task.AutoClaimFinishTask;
import com.github.intellectualsites.plotsquared.plot.util.AutoClaimFinishTask; import com.plotsquared.core.util.EconHandler;
import com.github.intellectualsites.plotsquared.plot.util.EconHandler; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.Permissions;
import com.github.intellectualsites.plotsquared.plot.util.Permissions; import com.plotsquared.core.util.task.TaskManager;
import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
import com.google.common.primitives.Ints; import com.google.common.primitives.Ints;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;

13
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java → Core/src/main/java/com/plotsquared/core/command/Biome.java
View File

@ -23,14 +23,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.StringMan;
import com.github.intellectualsites.plotsquared.plot.util.StringMan;
import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.biome.BiomeTypes; import com.sk89q.worldedit.world.biome.BiomeTypes;

33
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java → Core/src/main/java/com/plotsquared/core/command/Buy.java
View File

@ -23,23 +23,21 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.commands.Command; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.events.Result;
import com.github.intellectualsites.plotsquared.plot.events.PlotFlagRemoveEvent; import com.plotsquared.core.plot.flag.PlotFlag;
import com.github.intellectualsites.plotsquared.plot.events.Result; import com.plotsquared.core.plot.flag.implementations.PriceFlag;
import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.PriceFlag; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.util.task.RunnableVal2;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.util.task.RunnableVal3;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; import com.plotsquared.core.util.EconHandler;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.EconHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
@ -90,7 +88,8 @@ public class Buy extends Command {
Captions.PLOT_SOLD.send(owner, plot.getId(), player.getName(), price); Captions.PLOT_SOLD.send(owner, plot.getId(), player.getName(), price);
} }
PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(PriceFlag.class); PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(PriceFlag.class);
PlotFlagRemoveEvent event = PlotSquared.get().getEventDispatcher().callFlagRemove(plotFlag, plot); PlotFlagRemoveEvent
event = PlotSquared.get().getEventDispatcher().callFlagRemove(plotFlag, plot);
if(event.getEventResult() != Result.DENY) { if(event.getEventResult() != Result.DENY) {
plot.removeFlag(event.getFlag()); plot.removeFlag(event.getFlag());
} }

37
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Caps.java → Core/src/main/java/com/plotsquared/core/command/Caps.java
View File

@ -23,27 +23,26 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnimalCapFlag; import com.plotsquared.core.plot.flag.PlotFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.EntityCapFlag; import com.plotsquared.core.plot.flag.implementations.AnimalCapFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.HostileCapFlag; import com.plotsquared.core.plot.flag.implementations.EntityCapFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.MiscCapFlag; import com.plotsquared.core.plot.flag.implementations.HostileCapFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.MobCapFlag; import com.plotsquared.core.plot.flag.implementations.MiscCapFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.VehicleCapFlag; import com.plotsquared.core.plot.flag.implementations.MobCapFlag;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.plot.flag.implementations.VehicleCapFlag;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.util.Permissions;
import com.github.intellectualsites.plotsquared.plot.util.Permissions;
import static com.github.intellectualsites.plotsquared.plot.util.entity.EntityCategories.CAP_ANIMAL; import static com.plotsquared.core.util.entity.EntityCategories.CAP_ANIMAL;
import static com.github.intellectualsites.plotsquared.plot.util.entity.EntityCategories.CAP_ENTITY; import static com.plotsquared.core.util.entity.EntityCategories.CAP_ENTITY;
import static com.github.intellectualsites.plotsquared.plot.util.entity.EntityCategories.CAP_MISC; import static com.plotsquared.core.util.entity.EntityCategories.CAP_MISC;
import static com.github.intellectualsites.plotsquared.plot.util.entity.EntityCategories.CAP_MOB; import static com.plotsquared.core.util.entity.EntityCategories.CAP_MOB;
import static com.github.intellectualsites.plotsquared.plot.util.entity.EntityCategories.CAP_MONSTER; import static com.plotsquared.core.util.entity.EntityCategories.CAP_MONSTER;
import static com.github.intellectualsites.plotsquared.plot.util.entity.EntityCategories.CAP_VEHICLE; import static com.plotsquared.core.util.entity.EntityCategories.CAP_VEHICLE;
@CommandDeclaration(command = "caps", @CommandDeclaration(command = "caps",
category = CommandCategory.INFO, category = CommandCategory.INFO,

5
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java → Core/src/main/java/com/plotsquared/core/command/Chat.java
View File

@ -23,10 +23,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
@CommandDeclaration(command = "chat", @CommandDeclaration(command = "chat",
description = "Toggle plot chat on or off", description = "Toggle plot chat on or off",

36
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java → Core/src/main/java/com/plotsquared/core/command/Claim.java
View File

@ -23,22 +23,27 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; import com.plotsquared.core.configuration.CaptionUtility;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.core.configuration.Settings;
import com.github.intellectualsites.plotsquared.plot.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.github.intellectualsites.plotsquared.plot.events.PlayerClaimPlotEvent; import com.plotsquared.core.events.PlayerClaimPlotEvent;
import com.github.intellectualsites.plotsquared.plot.events.PlotMergeEvent; import com.plotsquared.core.events.PlotMergeEvent;
import com.github.intellectualsites.plotsquared.plot.events.Result; import com.plotsquared.core.events.Result;
import com.github.intellectualsites.plotsquared.plot.object.*; import com.plotsquared.core.util.EconHandler;
import com.github.intellectualsites.plotsquared.plot.util.EconHandler; import com.plotsquared.core.util.Permissions;
import com.github.intellectualsites.plotsquared.plot.util.Permissions; import com.plotsquared.core.util.task.TaskManager;
import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import com.plotsquared.core.util.task.RunnableVal;
import com.google.common.primitives.Ints; import com.google.common.primitives.Ints;
import com.plotsquared.core.location.Direction;
import com.plotsquared.core.util.Expression;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;
@CommandDeclaration(command = "claim", @CommandDeclaration(command = "claim",
aliases = "c", aliases = "c",
@ -59,7 +64,8 @@ public class Claim extends SubCommand {
if (plot == null) { if (plot == null) {
return sendMessage(player, Captions.NOT_IN_PLOT); return sendMessage(player, Captions.NOT_IN_PLOT);
} }
PlayerClaimPlotEvent event = PlotSquared.get().getEventDispatcher().callClaim(player, plot, schematic); PlayerClaimPlotEvent
event = PlotSquared.get().getEventDispatcher().callClaim(player, plot, schematic);
schematic = event.getSchematic(); schematic = event.getSchematic();
if (event.getEventResult() == Result.DENY) { if (event.getEventResult() == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Claim"); sendMessage(player, Captions.EVENT_DENIED, "Claim");

36
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java → Core/src/main/java/com/plotsquared/core/command/Clear.java
View File

@ -23,29 +23,27 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.commands.Command; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.configuration.Settings;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.core.events.Result;
import com.github.intellectualsites.plotsquared.plot.events.PlotFlagRemoveEvent; import com.plotsquared.core.plot.flag.PlotFlag;
import com.github.intellectualsites.plotsquared.plot.events.Result; import com.plotsquared.core.plot.flag.implementations.AnalysisFlag;
import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnalysisFlag; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.util.task.RunnableVal2;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.util.task.RunnableVal3;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; import com.plotsquared.core.util.Permissions;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.queue.GlobalBlockQueue;
import com.github.intellectualsites.plotsquared.plot.util.Permissions;
import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import static com.github.intellectualsites.plotsquared.plot.commands.SubCommand.sendMessage; import static com.plotsquared.core.command.SubCommand.sendMessage;
@CommandDeclaration(command = "clear", @CommandDeclaration(command = "clear",
description = "Clear the plot you stand on", description = "Clear the plot you stand on",

33
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java → Core/src/main/java/com/plotsquared/core/command/Cluster.java
View File

@ -23,24 +23,23 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.Settings;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.core.database.DBFunc;
import com.github.intellectualsites.plotsquared.plot.database.DBFunc; import com.plotsquared.core.location.BlockLoc;
import com.github.intellectualsites.plotsquared.plot.object.BlockLoc; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.core.plot.PlotCluster;
import com.github.intellectualsites.plotsquared.plot.object.PlotCluster; import com.plotsquared.core.plot.PlotId;
import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.events.TeleportCause;
import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.Permissions;
import com.github.intellectualsites.plotsquared.plot.util.Permissions; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;

9
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java → Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java
View File

@ -23,11 +23,12 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.util; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.object.CmdInstance; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.core.util.task.TaskManager;
public class CmdConfirm { public class CmdConfirm {

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/CmdInstance.java → Core/src/main/java/com/plotsquared/core/command/CmdInstance.java
View File

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.object; package com.plotsquared.core.command;
public class CmdInstance { public class CmdInstance {
public final Runnable command; public final Runnable command;

29
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java → Core/src/main/java/com/plotsquared/core/command/Command.java
View File

@ -23,23 +23,20 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; import com.plotsquared.core.configuration.file.YamlConfiguration;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.commands.MainCommand; import com.plotsquared.core.plot.message.PlotMessage;
import com.github.intellectualsites.plotsquared.plot.commands.RequiredType; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.util.task.RunnableVal2;
import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; import com.plotsquared.core.util.task.RunnableVal3;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; import com.plotsquared.core.util.MathMan;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; import com.plotsquared.core.util.Permissions;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.StringComparison;
import com.github.intellectualsites.plotsquared.plot.util.MathMan; import com.plotsquared.core.util.StringMan;
import com.github.intellectualsites.plotsquared.plot.util.Permissions;
import com.github.intellectualsites.plotsquared.plot.util.StringComparison;
import com.github.intellectualsites.plotsquared.plot.util.StringMan;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;

4
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java → Core/src/main/java/com/plotsquared/core/command/CommandCaller.java
View File

@ -23,9 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.plot.commands.RequiredType;
public interface CommandCaller { public interface CommandCaller {

4
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java → Core/src/main/java/com/plotsquared/core/command/CommandCategory.java
View File

@ -23,9 +23,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.Captions;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
/** /**

5
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java → Core/src/main/java/com/plotsquared/core/command/CommandDeclaration.java
View File

@ -23,10 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory;
import com.github.intellectualsites.plotsquared.plot.commands.RequiredType;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

21
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java → Core/src/main/java/com/plotsquared/core/command/Comment.java
View File

@ -23,18 +23,17 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.plot.comment.CommentInbox;
import com.github.intellectualsites.plotsquared.plot.object.comment.CommentInbox; import com.plotsquared.core.plot.comment.PlotComment;
import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment; import com.plotsquared.core.plot.comment.CommentManager;
import com.github.intellectualsites.plotsquared.plot.util.CommentManager; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.StringMan;
import com.github.intellectualsites.plotsquared.plot.util.StringMan; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale; import java.util.Locale;

21
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java → Core/src/main/java/com/plotsquared/core/command/Condense.java
View File

@ -23,18 +23,17 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.core.plot.PlotId;
import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.MathMan;
import com.github.intellectualsites.plotsquared.plot.util.MathMan; import com.plotsquared.core.util.task.TaskManager;
import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import com.plotsquared.core.util.WorldUtil;
import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;

15
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Confirm.java → Core/src/main/java/com/plotsquared/core/command/Confirm.java
View File

@ -23,16 +23,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.Settings;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.CmdInstance; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.util.task.TaskManager;
import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
@CommandDeclaration(command = "confirm", @CommandDeclaration(command = "confirm",
permission = "plots.use", permission = "plots.use",

25
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Continue.java → Core/src/main/java/com/plotsquared/core/command/Continue.java
View File

@ -23,20 +23,19 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.configuration.Settings;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.github.intellectualsites.plotsquared.plot.events.PlotFlagRemoveEvent; import com.plotsquared.core.events.Result;
import com.github.intellectualsites.plotsquared.plot.events.Result; import com.plotsquared.core.plot.flag.PlotFlag;
import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.Permissions;
import com.github.intellectualsites.plotsquared.plot.util.Permissions;
@CommandDeclaration(command = "continue", @CommandDeclaration(command = "continue",
description = "Continue a plot that was previously marked as done", description = "Continue a plot that was previously marked as done",

15
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java → Core/src/main/java/com/plotsquared/core/command/Copy.java
View File

@ -23,15 +23,14 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.Permissions;
import com.github.intellectualsites.plotsquared.plot.util.Permissions;
@CommandDeclaration(command = "copy", @CommandDeclaration(command = "copy",
permission = "plots.copy", permission = "plots.copy",

17
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java → Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java
View File

@ -23,16 +23,15 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.configuration.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.core.generator.HybridPlotWorld;
import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld; import com.plotsquared.core.generator.HybridUtils;
import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; import com.plotsquared.core.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
@CommandDeclaration(command = "createroadschematic", @CommandDeclaration(command = "createroadschematic",
aliases = {"crs"}, aliases = {"crs"},

30
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DatabaseCommand.java → Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java
View File

@ -23,21 +23,21 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.github.intellectualsites.plotsquared.plot.commands; package com.plotsquared.core.command;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.plotsquared.core.database.DBFunc;
import com.github.intellectualsites.plotsquared.plot.database.DBFunc; import com.plotsquared.core.database.MySQL;
import com.github.intellectualsites.plotsquared.plot.database.MySQL; import com.plotsquared.core.database.SQLManager;
import com.github.intellectualsites.plotsquared.plot.database.SQLManager; import com.plotsquared.core.database.SQLite;
import com.github.intellectualsites.plotsquared.plot.database.SQLite; import com.plotsquared.core.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.core.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.core.plot.PlotId;
import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.plotsquared.core.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.plotsquared.core.plot.world.SinglePlotArea;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; import com.plotsquared.core.util.MainUtil;
import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import com.plotsquared.core.util.task.TaskManager;
import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import com.plotsquared.core.database.Database;
import java.io.File; import java.io.File;
import java.sql.SQLException; import java.sql.SQLException;
@ -93,7 +93,7 @@ public class DatabaseCommand extends SubCommand {
return false; return false;
} }
try { try {
com.github.intellectualsites.plotsquared.plot.database.Database implementation; Database implementation;
String prefix = ""; String prefix = "";
switch (args[0].toLowerCase()) { switch (args[0].toLowerCase()) {
case "import": case "import":

Some files were not shown because too many files have changed in this diff Show More