EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 07:06:44 +01:00
Code Issues Projects Releases Wiki Activity

Moved more packaged based on feedback

Browse Source
This commit is contained in:
MattBDev 2020-04-10 20:19:18 -04:00
parent 5be2dfa747
commit dfa977a020
437 changed files with 2995 additions and 2871 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Bukkit/build.gradle
View File

@ -45,31 +45,31 @@ processResources {
//noinspection GroovyAssignabilityCheck //noinspection GroovyAssignabilityCheck
jar.archiveFileName = "PlotSquared-BukkitAPI-${project.parent.version}.jar" jar.archiveFileName = "PlotSquared-BukkitAPI-${project.parent.version}.jar"
jar.destinationDirectory = file("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-BukkitAPI/" + project.parent.version) jar.destinationDirectory = file("../mvn/com/plotsquared/PlotSquared-BukkitAPI/" + project.parent.version)
task createPom { task createPom {
doLast { doLast {
pom { pom {
project { project {
groupId = "com.github.intellectualsites.plotsquared" groupId = "com.plotsquared"
artifactId = "PlotSquared-BukkitAPI" artifactId = "PlotSquared-BukkitAPI"
version = project.parent.version version = project.parent.version
} }
}.writeTo("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-BukkitAPI/${project.parent.version}/PlotSquared-BukkitAPI-${project.parent.version}.pom") }.writeTo("../mvn/com/plotsquared/PlotSquared-BukkitAPI/${project.parent.version}/PlotSquared-BukkitAPI-${project.parent.version}.pom")
pom { pom {
project { project {
groupId = "com.github.intellectualsites.plotsquared" groupId = "com.plotsquared"
artifactId = "PlotSquared-BukkitAPI" artifactId = "PlotSquared-BukkitAPI"
version = "latest" version = "latest"
} }
}.writeTo("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-BukkitAPI/latest/PlotSquared-BukkitAPI-latest.pom") }.writeTo("../mvn/com/plotsquared/PlotSquared-BukkitAPI/latest/PlotSquared-BukkitAPI-latest.pom")
} }
} }
task copyFiles { task copyFiles {
doLast { doLast {
copy { copy {
from("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-BukkitAPI/${project.parent.version}/") from("../mvn/com/plotsquared/PlotSquared-BukkitAPI/${project.parent.version}/")
into("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-BukkitAPI/latest/") into("../mvn/com/plotsquared/PlotSquared-BukkitAPI/latest/")
include("PlotSquared-BukkitAPI*.jar") include("PlotSquared-BukkitAPI*.jar")
rename("PlotSquared-BukkitAPI-${project.parent.version}.jar", "PlotSquared-BukkitAPI-latest.jar") rename("PlotSquared-BukkitAPI-${project.parent.version}.jar", "PlotSquared-BukkitAPI-latest.jar")
} }
@ -83,8 +83,8 @@ shadowJar {
include(dependency("io.papermc:paperlib:1.0.2")) include(dependency("io.papermc:paperlib:1.0.2"))
include(dependency("net.kyori:text-adapter-bukkit:3.0.3")) include(dependency("net.kyori:text-adapter-bukkit:3.0.3"))
} }
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")
archiveFileName = "${parent.name}-${project.name}-${parent.version}.jar" archiveFileName = "${parent.name}-${project.name}-${parent.version}.jar"
destinationDirectory = file "../target" destinationDirectory = file "../target"
} }

8
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
View File

@ -1,8 +0,0 @@
package com.github.intellectualsites.plotsquared.bukkit.util;
import com.github.intellectualsites.plotsquared.generator.HybridUtils;
public class BukkitHybridUtils extends HybridUtils {
}

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

@ -1,5 +0,0 @@
package com.github.intellectualsites.plotsquared.bukkit.util;
public class BukkitVersion {
public static int[] v1_13_2 = {1, 13, 2};
}

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

@ -1,22 +1,22 @@
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.PlotSquared;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.bukkit.util.BukkitUtil;
import com.github.intellectualsites.plotsquared.generator.AugmentedUtils; import com.plotsquared.generator.AugmentedUtils;
import com.github.intellectualsites.plotsquared.listener.WEExtent; import com.plotsquared.listener.WEExtent;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.PlotLoc; import com.plotsquared.location.PlotLoc;
import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.plotsquared.util.tasks.RunnableVal;
import com.github.intellectualsites.plotsquared.util.ChunkManager; import com.plotsquared.util.ChunkManager;
import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.plotsquared.util.tasks.TaskManager;
import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; import com.plotsquared.queue.GlobalBlockQueue;
import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; import com.plotsquared.queue.LocalBlockQueue;
import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; import com.plotsquared.queue.ScopedLocalBlockQueue;
import com.github.intellectualsites.plotsquared.util.RegionUtil; import com.plotsquared.util.RegionUtil;
import com.sk89q.worldedit.bukkit.BukkitWorld; import com.sk89q.worldedit.bukkit.BukkitWorld;
import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.math.BlockVector3;

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

@ -1,9 +1,10 @@
package com.github.intellectualsites.plotsquared.bukkit.util; package com.plotsquared.bukkit;
import com.github.intellectualsites.plotsquared.bukkit.commands.DebugUUID; import com.plotsquared.bukkit.commands.DebugUUID;
import com.github.intellectualsites.plotsquared.commands.MainCommand; import com.plotsquared.bukkit.util.BukkitUtil;
import com.github.intellectualsites.plotsquared.player.ConsolePlayer; import com.plotsquared.commands.MainCommand;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.ConsolePlayer;
import com.plotsquared.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;
@ -48,12 +49,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.commands.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.commands.Command o : objects) {
result.add(o.toString()); result.add(o.toString());
} }
return result.isEmpty() ? null : result; return result.isEmpty() ? null : result;

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

@ -1,71 +1,69 @@
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.listeners.ChunkListener;
import com.github.intellectualsites.plotsquared.bukkit.listeners.EntitySpawnListener; import com.plotsquared.bukkit.listeners.EntitySpawnListener;
import com.github.intellectualsites.plotsquared.bukkit.listeners.PlayerEvents; import com.plotsquared.bukkit.listeners.PlayerEvents;
import com.github.intellectualsites.plotsquared.bukkit.listeners.SingleWorldListener; import com.plotsquared.bukkit.listeners.SingleWorldListener;
import com.github.intellectualsites.plotsquared.bukkit.listeners.WorldEvents; import com.plotsquared.bukkit.listeners.WorldEvents;
import com.github.intellectualsites.plotsquared.bukkit.placeholders.PlaceholderFormatter; import com.plotsquared.bukkit.placeholders.PlaceholderFormatter;
import com.github.intellectualsites.plotsquared.bukkit.placeholders.Placeholders; import com.plotsquared.bukkit.placeholders.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.Metrics;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.SetGenCB;
import com.github.intellectualsites.plotsquared.bukkit.util.Metrics; import com.plotsquared.bukkit.util.UpdateUtility;
import com.github.intellectualsites.plotsquared.bukkit.util.SetGenCB; import com.plotsquared.bukkit.util.block.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.configuration.ConfigurationSection;
import com.github.intellectualsites.plotsquared.bukkit.uuid.SQLUUIDHandler; import com.plotsquared.IPlotMain;
import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.IPlotMain; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.config.ChatFormatter;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.ConfigurationNode;
import com.github.intellectualsites.plotsquared.plot.config.ChatFormatter; import com.plotsquared.config.Settings;
import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; import com.plotsquared.generator.GeneratorWrapper;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.generator.HybridGen;
import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; import com.plotsquared.generator.HybridUtils;
import com.github.intellectualsites.plotsquared.generator.HybridGen; import com.plotsquared.generator.IndependentPlotGenerator;
import com.github.intellectualsites.plotsquared.generator.HybridUtils; import com.plotsquared.listener.PlotListener;
import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.listener.PlotListener; import com.plotsquared.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.PlotId;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.plotsquared.plot.SetupObject;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.plot.message.PlainChatManager;
import com.github.intellectualsites.plotsquared.plot.object.SetupObject; import com.plotsquared.plot.worlds.PlotAreaManager;
import com.github.intellectualsites.plotsquared.plot.object.message.PlainChatManager; import com.plotsquared.plot.worlds.SinglePlotArea;
import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; import com.plotsquared.plot.worlds.SinglePlotAreaManager;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; import com.plotsquared.plot.worlds.SingleWorldGenerator;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; import com.plotsquared.util.ChatManager;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SingleWorldGenerator; import com.plotsquared.util.ChunkManager;
import com.github.intellectualsites.plotsquared.util.ChatManager; import com.plotsquared.util.ConsoleColors;
import com.github.intellectualsites.plotsquared.util.ChunkManager; import com.plotsquared.util.EconHandler;
import com.github.intellectualsites.plotsquared.util.ConsoleColors; import com.plotsquared.util.InventoryUtil;
import com.github.intellectualsites.plotsquared.util.EconHandler; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.InventoryUtil; import com.plotsquared.util.PremiumVerification;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.ReflectionUtils;
import com.github.intellectualsites.plotsquared.util.PremiumVerification; import com.plotsquared.util.SchematicHandler;
import com.github.intellectualsites.plotsquared.util.ReflectionUtils; import com.plotsquared.util.SetupUtils;
import com.github.intellectualsites.plotsquared.util.SchematicHandler; import com.plotsquared.util.StringMan;
import com.github.intellectualsites.plotsquared.util.SetupUtils; import com.plotsquared.util.tasks.TaskManager;
import com.github.intellectualsites.plotsquared.util.StringMan; import com.plotsquared.util.uuid.UUIDHandler;
import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.plotsquared.util.uuid.UUIDHandlerImplementation;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.util.WorldUtil;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandlerImplementation; import com.plotsquared.queue.QueueProvider;
import com.github.intellectualsites.plotsquared.util.WorldUtil; import com.plotsquared.util.uuid.UUIDWrapper;
import com.github.intellectualsites.plotsquared.queue.QueueProvider;
import com.github.intellectualsites.plotsquared.util.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;
@ -101,8 +99,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.util.PremiumVerification.getUserID; import static com.plotsquared.util.PremiumVerification.getUserID;
import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getRefClass; import static com.plotsquared.util.ReflectionUtils.getRefClass;
public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain { public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
@ -383,7 +381,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.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) {
@ -440,7 +438,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.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) {
@ -459,7 +457,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.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

@ -1,4 +1,4 @@
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

@ -1,4 +1,4 @@
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

@ -1,4 +1,4 @@
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

@ -1,4 +1,4 @@
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

@ -1,4 +1,4 @@
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

@ -1,4 +1,4 @@
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

@ -1,4 +1,4 @@
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/commands/DebugUUID.java
View File

@ -1,27 +1,27 @@
package com.github.intellectualsites.plotsquared.bukkit.commands; package com.plotsquared.bukkit.commands;
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.commands.Argument;
import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.plotsquared.commands.CommandDeclaration;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.commands.CommandCategory; import com.plotsquared.commands.CommandCategory;
import com.github.intellectualsites.plotsquared.commands.RequiredType; import com.plotsquared.commands.RequiredType;
import com.github.intellectualsites.plotsquared.commands.SubCommand; import com.plotsquared.commands.SubCommand;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.database.DBFunc; import com.plotsquared.database.DBFunc;
import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; import com.plotsquared.player.OfflinePlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; import com.plotsquared.util.StringWrapper;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.StringMan; import com.plotsquared.util.StringMan;
import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.plotsquared.util.tasks.TaskManager;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.util.uuid.UUIDHandler;
import com.github.intellectualsites.plotsquared.util.WorldUtil; import com.plotsquared.util.WorldUtil;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; import com.plotsquared.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

@ -1,4 +1,4 @@
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

@ -1,4 +1,4 @@
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

@ -1,4 +1,4 @@
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

@ -1,4 +1,4 @@
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

@ -1,4 +1,4 @@
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

@ -1,4 +1,4 @@
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

@ -1,6 +1,6 @@
package com.github.intellectualsites.plotsquared.bukkit.object.entity; package com.plotsquared.bukkit.entity;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.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

@ -1,4 +1,4 @@
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

@ -1,6 +1,6 @@
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;

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

@ -1,6 +1,6 @@
package com.github.intellectualsites.plotsquared.bukkit.generator; package com.plotsquared.bukkit.generator;
import com.github.intellectualsites.plotsquared.generator.AugmentedUtils; import com.plotsquared.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;

8
Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitHybridUtils.java Normal file
View File

@ -0,0 +1,8 @@
package com.plotsquared.bukkit.generator;
import com.plotsquared.generator.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

@ -1,16 +1,16 @@
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.util.block.GenChunk;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; import com.plotsquared.generator.GeneratorWrapper;
import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; import com.plotsquared.generator.IndependentPlotGenerator;
import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper; import com.plotsquared.location.ChunkWrapper;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SingleWorldGenerator; import com.plotsquared.plot.worlds.SingleWorldGenerator;
import com.github.intellectualsites.plotsquared.util.ChunkManager; import com.plotsquared.util.ChunkManager;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; import com.plotsquared.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

@ -1,13 +1,13 @@
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.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; import com.plotsquared.generator.IndependentPlotGenerator;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.plotsquared.plot.PlotId;
import com.github.intellectualsites.plotsquared.util.MathMan; import com.plotsquared.util.MathMan;
import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; import com.plotsquared.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;

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

@ -1,12 +1,12 @@
package com.github.intellectualsites.plotsquared.bukkit.generator; package com.plotsquared.bukkit.generator;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; import com.plotsquared.generator.IndependentPlotGenerator;
import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper; import com.plotsquared.location.ChunkWrapper;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.plot.PlotArea;
import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; import com.plotsquared.queue.GlobalBlockQueue;
import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; import com.plotsquared.queue.LocalBlockQueue;
import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; import com.plotsquared.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;

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

@ -1,13 +1,13 @@
package com.github.intellectualsites.plotsquared.bukkit.listeners; package com.plotsquared.bukkit.listeners;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.config.Settings;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefClass; import com.plotsquared.util.ReflectionUtils.RefClass;
import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefField; import com.plotsquared.util.ReflectionUtils.RefField;
import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefMethod; import com.plotsquared.util.ReflectionUtils.RefMethod;
import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.plotsquared.util.tasks.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;
@ -30,7 +30,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.util.ReflectionUtils.getRefClass; import static com.plotsquared.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/listeners/EntitySpawnListener.java
View File

@ -1,12 +1,12 @@
package com.github.intellectualsites.plotsquared.bukkit.listeners; package com.plotsquared.bukkit.listeners;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.config.Settings;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; import com.plotsquared.plot.flags.implementations.DoneFlag;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.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/listeners/ForceFieldListener.java
View File

@ -1,13 +1,13 @@
package com.github.intellectualsites.plotsquared.bukkit.listeners; package com.plotsquared.bukkit.listeners;
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.config.Captions;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.ForcefieldFlag; import com.plotsquared.plot.flags.implementations.ForcefieldFlag;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.Permissions; import com.plotsquared.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;

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

@ -1,33 +1,82 @@
package com.github.intellectualsites.plotsquared.bukkit.listeners; package com.plotsquared.bukkit.listeners;
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.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.config.Settings;
import com.github.intellectualsites.plotsquared.database.DBFunc; import com.plotsquared.database.DBFunc;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.*; import com.plotsquared.plot.flags.implementations.AnimalAttackFlag;
import com.github.intellectualsites.plotsquared.plot.flags.types.BlockTypeWrapper; import com.plotsquared.plot.flags.implementations.AnimalCapFlag;
import com.github.intellectualsites.plotsquared.listener.PlayerBlockEventType; import com.plotsquared.plot.flags.implementations.AnimalInteractFlag;
import com.github.intellectualsites.plotsquared.listener.PlotListener; import com.plotsquared.plot.flags.implementations.BlockBurnFlag;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.plot.flags.implementations.BlockIgnitionFlag;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.flags.implementations.BlockedCmdsFlag;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.plot.flags.implementations.BreakFlag;
import com.github.intellectualsites.plotsquared.plot.object.PlotHandler; import com.plotsquared.plot.flags.implementations.CoralDryFlag;
import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.plotsquared.plot.flags.implementations.DenyTeleportFlag;
import com.github.intellectualsites.plotsquared.plot.object.PlotInventory; import com.plotsquared.plot.flags.implementations.DisablePhysicsFlag;
import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; import com.plotsquared.plot.flags.implementations.DoneFlag;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.plot.flags.implementations.DropProtectionFlag;
import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; import com.plotsquared.plot.flags.implementations.EntityCapFlag;
import com.github.intellectualsites.plotsquared.util.EntityUtil; import com.plotsquared.plot.flags.implementations.ExplosionFlag;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.plot.flags.implementations.GrassGrowFlag;
import com.github.intellectualsites.plotsquared.util.MathMan; import com.plotsquared.plot.flags.implementations.HangingBreakFlag;
import com.github.intellectualsites.plotsquared.util.Permissions; import com.plotsquared.plot.flags.implementations.HangingPlaceFlag;
import com.github.intellectualsites.plotsquared.util.RegExUtil; import com.plotsquared.plot.flags.implementations.HostileAttackFlag;
import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.plotsquared.plot.flags.implementations.HostileCapFlag;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.plot.flags.implementations.HostileInteractFlag;
import com.plotsquared.plot.flags.implementations.IceFormFlag;
import com.plotsquared.plot.flags.implementations.IceMeltFlag;
import com.plotsquared.plot.flags.implementations.InstabreakFlag;
import com.plotsquared.plot.flags.implementations.InvincibleFlag;
import com.plotsquared.plot.flags.implementations.ItemDropFlag;
import com.plotsquared.plot.flags.implementations.KelpGrowFlag;
import com.plotsquared.plot.flags.implementations.LiquidFlowFlag;
import com.plotsquared.plot.flags.implementations.MiscBreakFlag;
import com.plotsquared.plot.flags.implementations.MiscCapFlag;
import com.plotsquared.plot.flags.implementations.MiscInteractFlag;
import com.plotsquared.plot.flags.implementations.MobCapFlag;
import com.plotsquared.plot.flags.implementations.MobPlaceFlag;
import com.plotsquared.plot.flags.implementations.MycelGrowFlag;
import com.plotsquared.plot.flags.implementations.PlaceFlag;
import com.plotsquared.plot.flags.implementations.PlayerInteractFlag;
import com.plotsquared.plot.flags.implementations.PveFlag;
import com.plotsquared.plot.flags.implementations.PvpFlag;
import com.plotsquared.plot.flags.implementations.RedstoneFlag;
import com.plotsquared.plot.flags.implementations.SnowFormFlag;
import com.plotsquared.plot.flags.implementations.SnowMeltFlag;
import com.plotsquared.plot.flags.implementations.SoilDryFlag;
import com.plotsquared.plot.flags.implementations.TamedAttackFlag;
import com.plotsquared.plot.flags.implementations.TamedInteractFlag;
import com.plotsquared.plot.flags.implementations.UntrustedVisitFlag;
import com.plotsquared.plot.flags.implementations.UseFlag;
import com.plotsquared.plot.flags.implementations.VehicleBreakFlag;
import com.plotsquared.plot.flags.implementations.VehicleCapFlag;
import com.plotsquared.plot.flags.implementations.VehicleUseFlag;
import com.plotsquared.plot.flags.implementations.VillagerInteractFlag;
import com.plotsquared.plot.flags.implementations.VineGrowFlag;
import com.plotsquared.plot.flags.types.BlockTypeWrapper;
import com.plotsquared.listener.PlayerBlockEventType;
import com.plotsquared.listener.PlotListener;
import com.plotsquared.location.Location;
import com.plotsquared.plot.Plot;
import com.plotsquared.plot.PlotArea;
import com.plotsquared.plot.PlotHandler;
import com.plotsquared.plot.PlotId;
import com.plotsquared.plot.PlotInventory;
import com.plotsquared.plot.message.PlotMessage;
import com.plotsquared.player.PlotPlayer;
import com.plotsquared.util.StringWrapper;
import com.plotsquared.util.EntityUtil;
import com.plotsquared.util.MainUtil;
import com.plotsquared.util.MathMan;
import com.plotsquared.util.Permissions;
import com.plotsquared.util.RegExUtil;
import com.plotsquared.util.tasks.TaskManager;
import com.plotsquared.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;
@ -2570,7 +2619,8 @@ public class PlayerEvents extends PlotListener implements Listener {
if (entity instanceof Monster && plot.getFlag(HostileInteractFlag.class)) { if (entity instanceof Monster && plot.getFlag(HostileInteractFlag.class)) {
return; return;
} }
if ((entity instanceof Animals || entity instanceof Golem) && plot.getFlag(AnimalInteractFlag.class)) { if ((entity instanceof Animals || entity instanceof Golem) && plot.getFlag(
AnimalInteractFlag.class)) {
return; return;
} }
if (entity instanceof Tameable && ((Tameable) entity).isTamed() && plot if (entity instanceof Tameable && ((Tameable) entity).isTamed() && plot

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

@ -1,9 +1,9 @@
package com.github.intellectualsites.plotsquared.bukkit.listeners; package com.plotsquared.bukkit.listeners;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; import com.plotsquared.plot.worlds.PlotAreaManager;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; import com.plotsquared.plot.worlds.SinglePlotAreaManager;
import com.github.intellectualsites.plotsquared.util.ReflectionUtils; import com.plotsquared.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;
@ -17,7 +17,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.util.ReflectionUtils.getRefClass; import static com.plotsquared.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/listeners/WorldEvents.java
View File

@ -1,10 +1,10 @@
package com.github.intellectualsites.plotsquared.bukkit.listeners; package com.plotsquared.bukkit.listeners;
import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator; import com.plotsquared.bukkit.generator.BukkitPlotGenerator;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; import com.plotsquared.generator.GeneratorWrapper;
import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; import com.plotsquared.plot.worlds.PlotAreaManager;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; import com.plotsquared.plot.worlds.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/placeholders/PlaceholderFormatter.java
View File

@ -1,8 +1,8 @@
package com.github.intellectualsites.plotsquared.bukkit.placeholders; package com.plotsquared.bukkit.placeholders;
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.config.ChatFormatter;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.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/placeholders/Placeholders.java
View File

@ -1,9 +1,9 @@
package com.github.intellectualsites.plotsquared.bukkit.placeholders; package com.plotsquared.bukkit.placeholders;
import com.github.intellectualsites.plotsquared.bukkit.BukkitMain; import com.plotsquared.bukkit.BukkitMain;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.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

@ -1,6 +1,6 @@
package com.github.intellectualsites.plotsquared.bukkit.object; package com.plotsquared.bukkit.player;
import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; import com.plotsquared.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

@ -1,16 +1,16 @@
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.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.location.Location;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; import com.plotsquared.events.TeleportCause;
import com.github.intellectualsites.plotsquared.util.EconHandler; import com.plotsquared.util.EconHandler;
import com.github.intellectualsites.plotsquared.util.MathMan; import com.plotsquared.util.MathMan;
import com.github.intellectualsites.plotsquared.plot.PlotWeather; import com.plotsquared.plot.PlotWeather;
import com.github.intellectualsites.plotsquared.util.StringMan; import com.plotsquared.util.StringMan;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.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;

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

@ -1,12 +1,13 @@
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.location.Location;
import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.plotsquared.bukkit.util.block.StateWrapper;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.tasks.RunnableVal;
import com.github.intellectualsites.plotsquared.util.SchematicHandler; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.plotsquared.util.SchematicHandler;
import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; import com.plotsquared.util.tasks.TaskManager;
import com.plotsquared.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;

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

@ -1,13 +1,13 @@
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.config.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.config.Settings;
import com.github.intellectualsites.plotsquared.player.ConsolePlayer; import com.plotsquared.player.ConsolePlayer;
import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; import com.plotsquared.plot.message.PlotMessage;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.ChatManager; import com.plotsquared.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

@ -1,10 +1,10 @@
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.player.OfflinePlotPlayer; import com.plotsquared.player.OfflinePlotPlayer;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.EconHandler; import com.plotsquared.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

@ -1,10 +1,10 @@
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.plot.PlotInventory;
import com.github.intellectualsites.plotsquared.plot.object.PlotItemStack; import com.plotsquared.plot.PlotItemStack;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.InventoryUtil; import com.plotsquared.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

@ -1,15 +1,15 @@
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.configuration.ConfigurationSection;
import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; import com.plotsquared.configuration.file.YamlConfiguration;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; import com.plotsquared.config.ConfigurationNode;
import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; import com.plotsquared.generator.GeneratorWrapper;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; import com.plotsquared.plot.PlotAreaType;
import com.github.intellectualsites.plotsquared.plot.object.SetupObject; import com.plotsquared.plot.SetupObject;
import com.github.intellectualsites.plotsquared.util.SetupUtils; import com.plotsquared.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

@ -1,7 +1,7 @@
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.util.tasks.TaskManager; import com.plotsquared.util.tasks.TaskManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
public class BukkitTaskManager extends TaskManager { public class BukkitTaskManager extends TaskManager {

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

@ -1,20 +1,20 @@
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.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.plotsquared.util.tasks.RunnableVal;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.MathMan; import com.plotsquared.util.MathMan;
import com.github.intellectualsites.plotsquared.util.StringComparison; import com.plotsquared.util.StringComparison;
import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.plotsquared.util.tasks.TaskManager;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.util.uuid.UUIDHandler;
import com.github.intellectualsites.plotsquared.util.WorldUtil; import com.plotsquared.util.WorldUtil;
import com.github.intellectualsites.plotsquared.util.BlockUtil; import com.plotsquared.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;

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

@ -1,4 +1,4 @@
package com.github.intellectualsites.plotsquared.bukkit.util; package com.plotsquared.bukkit.util;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;

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

@ -1,4 +1,4 @@
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;
@ -9,15 +9,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.util.ReflectionUtils.callConstructor; import static com.plotsquared.util.ReflectionUtils.callConstructor;
import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.callMethod; import static com.plotsquared.util.ReflectionUtils.callMethod;
import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getCbClass; import static com.plotsquared.util.ReflectionUtils.getCbClass;
import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getField; import static com.plotsquared.util.ReflectionUtils.getField;
import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getNmsClass; import static com.plotsquared.util.ReflectionUtils.getNmsClass;
import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getUtilClass; import static com.plotsquared.util.ReflectionUtils.getUtilClass;
import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.makeConstructor; import static com.plotsquared.util.ReflectionUtils.makeConstructor;
import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.makeField; import static com.plotsquared.util.ReflectionUtils.makeField;
import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.makeMethod; import static com.plotsquared.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

@ -1,16 +1,16 @@
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.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefClass; import com.plotsquared.util.ReflectionUtils.RefClass;
import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefConstructor; import com.plotsquared.util.ReflectionUtils.RefConstructor;
import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefField; import com.plotsquared.util.ReflectionUtils.RefField;
import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefMethod; import com.plotsquared.util.ReflectionUtils.RefMethod;
import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.plotsquared.util.tasks.TaskManager;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.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;
@ -24,7 +24,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.util.ReflectionUtils.getRefClass; import static com.plotsquared.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

@ -1,9 +1,9 @@
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.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; import com.plotsquared.generator.GeneratorWrapper;
import com.github.intellectualsites.plotsquared.util.SetupUtils; import com.plotsquared.util.SetupUtils;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.generator.ChunkGenerator; import org.bukkit.generator.ChunkGenerator;

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

@ -1,8 +1,8 @@
package com.github.intellectualsites.plotsquared.bukkit.util; package com.plotsquared.bukkit.util;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.config.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;
@ -35,7 +35,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;
} }

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

@ -1,4 +1,4 @@
package com.github.intellectualsites.plotsquared.bukkit.object; package com.plotsquared.bukkit.util.block;
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;

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

@ -1,11 +1,9 @@
package com.github.intellectualsites.plotsquared.bukkit.util.block; package com.plotsquared.bukkit.util.block;
import com.github.intellectualsites.plotsquared.bukkit.object.BukkitBlockUtil; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.bukkit.object.schematic.StateWrapper; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.queue.BasicLocalBlockQueue;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.BlockUtil;
import com.github.intellectualsites.plotsquared.queue.BasicLocalBlockQueue;
import com.github.intellectualsites.plotsquared.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;

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

@ -1,12 +1,11 @@
package com.github.intellectualsites.plotsquared.bukkit.util.block; package com.plotsquared.bukkit.util.block;
import com.github.intellectualsites.plotsquared.bukkit.object.BukkitBlockUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.location.ChunkWrapper;
import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper; import com.plotsquared.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.queue.ScopedLocalBlockQueue;
import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; import com.plotsquared.util.PatternUtil;
import com.github.intellectualsites.plotsquared.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;

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

@ -1,8 +1,8 @@
package com.github.intellectualsites.plotsquared.bukkit.object.schematic; package com.plotsquared.bukkit.util.block;
import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.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/uuid/DatFileFilter.java → Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/DatFileFilter.java
View File

@ -1,4 +1,4 @@
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

@ -1,10 +1,10 @@
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.player.OfflinePlotPlayer; import com.plotsquared.player.OfflinePlotPlayer;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; import com.plotsquared.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;

26
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

@ -1,17 +1,17 @@
package com.github.intellectualsites.plotsquared.bukkit.uuid; package com.plotsquared.bukkit.util.uuid;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.config.Settings;
import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; import com.plotsquared.player.OfflinePlotPlayer;
import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.plotsquared.util.tasks.RunnableVal;
import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; import com.plotsquared.util.StringWrapper;
import com.github.intellectualsites.plotsquared.util.StringMan; import com.plotsquared.util.StringMan;
import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.plotsquared.util.tasks.TaskManager;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.util.uuid.UUIDHandler;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandlerImplementation; import com.plotsquared.util.uuid.UUIDHandlerImplementation;
import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; import com.plotsquared.plot.expiration.ExpireManager;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; import com.plotsquared.util.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.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;

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

@ -1,7 +1,7 @@
package com.github.intellectualsites.plotsquared.bukkit.uuid; package com.plotsquared.bukkit.util.uuid;
import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; import com.plotsquared.player.OfflinePlotPlayer;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.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

@ -1,12 +1,12 @@
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.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; import com.plotsquared.player.OfflinePlotPlayer;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; import com.plotsquared.util.StringWrapper;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.util.uuid.UUIDHandler;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; import com.plotsquared.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

@ -1,16 +1,16 @@
package com.github.intellectualsites.plotsquared.bukkit.uuid; package com.plotsquared.bukkit.util.uuid;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.config.Settings;
import com.github.intellectualsites.plotsquared.database.SQLite; import com.plotsquared.database.SQLite;
import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.plotsquared.util.tasks.RunnableVal;
import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; import com.plotsquared.util.StringWrapper;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.plotsquared.util.tasks.TaskManager;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.util.uuid.UUIDHandler;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandlerImplementation; import com.plotsquared.util.uuid.UUIDHandlerImplementation;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; import com.plotsquared.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

16
Core/build.gradle
View File

@ -35,31 +35,31 @@ processResources {
//noinspection GroovyAssignabilityCheck //noinspection GroovyAssignabilityCheck
jar.archiveFileName = "PlotSquared-CoreAPI-${project.parent.version}.jar" jar.archiveFileName = "PlotSquared-CoreAPI-${project.parent.version}.jar"
jar.destinationDirectory = file("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-CoreAPI/" + project.parent.version) jar.destinationDirectory = file("../mvn/com/plotsquared/PlotSquared-CoreAPI/" + project.parent.version)
task createPom { task createPom {
doLast { doLast {
pom { pom {
project { project {
groupId = "com.github.intellectualsites.plotsquared" groupId = "com.plotsquared"
artifactId = "PlotSquared-CoreAPI" artifactId = "PlotSquared-CoreAPI"
version = project.parent.version version = project.parent.version
} }
}.writeTo("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-CoreAPI/${project.parent.version}/PlotSquared-CoreAPI-${project.parent.version}.pom") }.writeTo("../mvn/com/plotsquared/PlotSquared-CoreAPI/${project.parent.version}/PlotSquared-CoreAPI-${project.parent.version}.pom")
pom { pom {
project { project {
groupId = "com.github.intellectualsites.plotsquared" groupId = "com.plotsquared"
artifactId = "PlotSquared-CoreAPI" artifactId = "PlotSquared-CoreAPI"
version = "latest" version = "latest"
} }
}.writeTo("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-CoreAPI/latest/PlotSquared-CoreAPI-latest.pom") }.writeTo("../mvn/com/plotsquared/PlotSquared-CoreAPI/latest/PlotSquared-CoreAPI-latest.pom")
} }
} }
task copyFiles { task copyFiles {
doLast { doLast {
copy { copy {
from("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-CoreAPI/${project.parent.version}/") from("../mvn/com/plotsquared/PlotSquared-CoreAPI/${project.parent.version}/")
into("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-CoreAPI/latest/") into("../mvn/com/plotsquared/PlotSquared-CoreAPI/latest/")
include("*.jar") include("*.jar")
rename("PlotSquared-CoreAPI-${project.parent.version}.jar", "PlotSquared-CoreAPI-latest.jar") rename("PlotSquared-CoreAPI-${project.parent.version}.jar", "PlotSquared-CoreAPI-latest.jar")
} }
@ -73,7 +73,7 @@ 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('net.kyori.text', 'com.github.intellectualsites.plotsquared.formatting.text') relocate('net.kyori.text', 'com.plotsquared.formatting.text')
} }
shadowJar.doLast { shadowJar.doLast {

5
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotWeather.java
View File

@ -1,5 +0,0 @@
package com.github.intellectualsites.plotsquared.plot;
public enum PlotWeather {
RAIN, CLEAR, RESET
}

222
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/GlobalFlagContainer.java
View File

@ -1,222 +0,0 @@
package com.github.intellectualsites.plotsquared.plot.flags;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnalysisFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnimalAttackFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnimalCapFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnimalInteractFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.BlockBurnFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.BlockIgnitionFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.BlockedCmdsFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.BreakFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.CoralDryFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.DenyExitFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.DenyTeleportFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.DescriptionFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.DeviceInteractFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.DisablePhysicsFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.DropProtectionFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.EntityCapFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.ExplosionFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.FarewellFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.FeedFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.FlyFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.ForcefieldFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.GamemodeFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.GrassGrowFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.GreetingFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.GuestGamemodeFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.HangingBreakFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.HangingPlaceFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.HealFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.HideInfoFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.HostileAttackFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.HostileCapFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.HostileInteractFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.IceFormFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.IceMeltFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.InstabreakFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.InvincibleFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.ItemDropFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.KeepFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.KelpGrowFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.LiquidFlowFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.MiscBreakFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.MiscCapFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.MobBreakFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.MobCapFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.MobPlaceFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.MusicFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.MycelGrowFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.NoWorldeditFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.NotifyEnterFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.NotifyLeaveFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.PlaceFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.PlayerInteractFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.PriceFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.PveFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.PvpFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.RedstoneFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.ServerPlotFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.SnowFormFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.SnowMeltFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.SoilDryFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.TamedAttackFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.TamedInteractFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.TimeFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.TitlesFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.UntrustedVisitFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.UseFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.VehicleBreakFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.VehicleCapFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.VehiclePlaceFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.VehicleUseFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.VillagerInteractFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.VineGrowFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.WeatherFlag;
import lombok.Getter;
import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
public final class GlobalFlagContainer extends FlagContainer {
@Getter private static final GlobalFlagContainer instance = new GlobalFlagContainer();
private static Map<String, Class<?>> stringClassMap;
private GlobalFlagContainer() {
super(null, (flag, type) -> {
if (type == PlotFlagUpdateType.FLAG_ADDED) {
stringClassMap.put(flag.getName().toLowerCase(Locale.ENGLISH), flag.getClass());
}
});
stringClassMap = new HashMap<>();
// Register all default flags here
// Boolean flags
this.addFlag(ExplosionFlag.EXPLOSION_FALSE);
this.addFlag(UntrustedVisitFlag.UNTRUSTED_VISIT_FLAG_TRUE);
this.addFlag(DenyExitFlag.DENY_EXIT_FLAG_FALSE);
this.addFlag(DescriptionFlag.DESCRIPTION_FLAG_EMPTY);
this.addFlag(GreetingFlag.GREETING_FLAG_EMPTY);
this.addFlag(FarewellFlag.FAREWELL_FLAG_EMPTY);
this.addFlag(AnimalAttackFlag.ANIMAL_ATTACK_FALSE);
this.addFlag(AnimalInteractFlag.ANIMAL_INTERACT_FALSE);
this.addFlag(BlockBurnFlag.BLOCK_BURN_FALSE);
this.addFlag(BlockIgnitionFlag.BLOCK_IGNITION_TRUE);
this.addFlag(DeviceInteractFlag.DEVICE_INTERACT_FALSE);
this.addFlag(DisablePhysicsFlag.DISABLE_PHYSICS_FALSE);
this.addFlag(DropProtectionFlag.DROP_PROTECTION_FALSE);
this.addFlag(ForcefieldFlag.FORCEFIELD_FALSE);
this.addFlag(GrassGrowFlag.GRASS_GROW_TRUE);
this.addFlag(HangingBreakFlag.HANGING_BREAK_FALSE);
this.addFlag(HangingPlaceFlag.HANGING_PLACE_FALSE);
this.addFlag(HideInfoFlag.HIDE_INFO_FALSE);
this.addFlag(HostileAttackFlag.HOSTILE_ATTACK_FALSE);
this.addFlag(HostileInteractFlag.HOSTILE_INTERACT_FALSE);
this.addFlag(IceFormFlag.ICE_FORM_FALSE);
this.addFlag(IceMeltFlag.ICE_MELT_FALSE);
this.addFlag(KelpGrowFlag.KELP_GROW_TRUE);
this.addFlag(LiquidFlowFlag.LIQUID_FLOW_TRUE);
this.addFlag(RedstoneFlag.REDSTONE_TRUE);
this.addFlag(ServerPlotFlag.SERVER_PLOT_FALSE);
this.addFlag(MiscBreakFlag.MISC_BREAK_FALSE);
this.addFlag(MobBreakFlag.MOB_BREAK_FALSE);
this.addFlag(MobPlaceFlag.MOB_PLACE_FALSE);
this.addFlag(MycelGrowFlag.MYCEL_GROW_TRUE);
this.addFlag(NotifyEnterFlag.NOTIFY_ENTER_FALSE);
this.addFlag(NotifyLeaveFlag.NOTIFY_LEAVE_FALSE);
this.addFlag(NoWorldeditFlag.NO_WORLDEDIT_FALSE);
this.addFlag(PlayerInteractFlag.PLAYER_INTERACT_FALSE);
this.addFlag(PveFlag.PVE_FALSE);
this.addFlag(PvpFlag.PVP_FALSE);
this.addFlag(SnowFormFlag.SNOW_FORM_FALSE);
this.addFlag(SnowMeltFlag.SNOW_MELT_TRUE);
this.addFlag(SoilDryFlag.SOIL_DRY_FALSE);
this.addFlag(CoralDryFlag.CORAL_DRY_FALSE);
this.addFlag(TamedAttackFlag.TAMED_ATTACK_FALSE);
this.addFlag(TamedInteractFlag.TAMED_INTERACT_FALSE);
this.addFlag(VehicleBreakFlag.VEHICLE_BREAK_FALSE);
this.addFlag(VehiclePlaceFlag.VEHICLE_PLACE_FALSE);
this.addFlag(VehicleUseFlag.VEHICLE_USE_FALSE);
this.addFlag(VillagerInteractFlag.VILLAGER_INTERACT_FALSE);
this.addFlag(VineGrowFlag.VINE_GROW_TRUE);
this.addFlag(ItemDropFlag.ITEM_DROP_TRUE);
this.addFlag(InstabreakFlag.INSTABREAK_FALSE);
this.addFlag(InvincibleFlag.INVINCIBLE_FALSE);
// Enum Flags
this.addFlag(WeatherFlag.PLOT_WEATHER_FLAG_OFF);
this.addFlag(DenyTeleportFlag.DENY_TELEPORT_FLAG_NONE);
this.addFlag(TitlesFlag.TITLES_NONE);
this.addFlag(FlyFlag.FLIGHT_FLAG_DEFAULT);
// Integer flags
this.addFlag(AnimalCapFlag.ANIMAL_CAP_UNLIMITED);
this.addFlag(EntityCapFlag.ENTITY_CAP_UNLIMITED);
this.addFlag(HostileCapFlag.HOSTILE_CAP_UNLIMITED);
this.addFlag(MiscCapFlag.MISC_CAP_UNLIMITED);
this.addFlag(MobCapFlag.MOB_CAP_UNLIMITED);
this.addFlag(TimeFlag.TIME_DISABLED);
this.addFlag(VehicleCapFlag.VEHICLE_CAP_UNLIMITED);
// Timed flags
this.addFlag(FeedFlag.FEED_NOTHING);
this.addFlag(HealFlag.HEAL_NOTHING);
// Double flags
this.addFlag(PriceFlag.PRICE_NOT_BUYABLE);
// Block type list flags
this.addFlag(BreakFlag.BREAK_NONE);
this.addFlag(PlaceFlag.PLACE_NONE);
this.addFlag(UseFlag.USE_NONE);
// Misc
this.addFlag(GamemodeFlag.GAMEMODE_FLAG_DEFAULT);
this.addFlag(GuestGamemodeFlag.GUEST_GAMEMODE_FLAG_DEFAULT);
this.addFlag(BlockedCmdsFlag.BLOCKED_CMDS_FLAG_NONE);
this.addFlag(KeepFlag.KEEP_FLAG_FALSE);
this.addFlag(MusicFlag.MUSIC_FLAG_NONE);
// Internal flags
this.addFlag(new AnalysisFlag(Collections.emptyList()));
this.addFlag(new DoneFlag(""));
}
@Override public PlotFlag<?, ?> getFlagErased(Class<?> flagClass) {
final PlotFlag<?, ?> flag = super.getFlagErased(flagClass);
if (flag != null) {
return flag;
} else {
throw new IllegalStateException(String.format("Unrecognized flag '%s'. All flag types"
+ " must be present in the global flag container.", flagClass.getSimpleName()));
}
}
@Nonnull @Override
public <V, T extends PlotFlag<V, ?>> T getFlag(Class<? extends T> flagClass) {
final PlotFlag<?, ?> flag = super.getFlag(flagClass);
if (flag != null) {
return castUnsafe(flag);
} else {
throw new IllegalStateException(String.format("Unrecognized flag '%s'. All flag types"
+ " must be present in the global flag container.", flagClass.getSimpleName()));
}
}
public Class<?> getFlagClassFromString(final String name) {
return stringClassMap.get(name.toLowerCase(Locale.ENGLISH));
}
public PlotFlag<?, ?> getFlagFromString(final String name) {
final Class<?> flagClass = this.getFlagClassFromString(name);
if (flagClass == null) {
return null;
}
return getFlagErased(flagClass);
}
}

5
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/TeleportCause.java
View File

@ -1,5 +0,0 @@
package com.github.intellectualsites.plotsquared.plot.object;
public enum TeleportCause {
COMMAND, PLUGIN, UNKNOWN
}

5
Core/src/main/java/com/github/intellectualsites/plotsquared/util/logger/ILogger.java
View File

@ -1,5 +0,0 @@
package com.github.intellectualsites.plotsquared.util.logger;
public interface ILogger {
void log(String message);
}

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

@ -1,20 +1,20 @@
package com.github.intellectualsites.plotsquared; package com.plotsquared;
import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; import com.plotsquared.generator.GeneratorWrapper;
import com.github.intellectualsites.plotsquared.generator.HybridUtils; import com.plotsquared.generator.HybridUtils;
import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; import com.plotsquared.generator.IndependentPlotGenerator;
import com.github.intellectualsites.plotsquared.util.logger.ILogger; import com.plotsquared.util.logger.ILogger;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.ChatManager; import com.plotsquared.util.ChatManager;
import com.github.intellectualsites.plotsquared.util.ChunkManager; import com.plotsquared.util.ChunkManager;
import com.github.intellectualsites.plotsquared.util.EconHandler; import com.plotsquared.util.EconHandler;
import com.github.intellectualsites.plotsquared.util.InventoryUtil; import com.plotsquared.util.InventoryUtil;
import com.github.intellectualsites.plotsquared.util.SchematicHandler; import com.plotsquared.util.SchematicHandler;
import com.github.intellectualsites.plotsquared.util.SetupUtils; import com.plotsquared.util.SetupUtils;
import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.plotsquared.util.tasks.TaskManager;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandlerImplementation; import com.plotsquared.util.uuid.UUIDHandlerImplementation;
import com.github.intellectualsites.plotsquared.util.WorldUtil; import com.plotsquared.util.WorldUtil;
import com.github.intellectualsites.plotsquared.queue.QueueProvider; import com.plotsquared.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/Platform.java → Core/src/main/java/com/plotsquared/Platform.java
View File

@ -1,4 +1,4 @@
package com.github.intellectualsites.plotsquared; package com.plotsquared;
public enum Platform { public enum Platform {
Bukkit, Sponge, Spigot, Paper Bukkit, Sponge, Spigot, Paper

107
Core/src/main/java/com/github/intellectualsites/plotsquared/PlotSquared.java → Core/src/main/java/com/plotsquared/PlotSquared.java
View File

@ -1,53 +1,62 @@
package com.github.intellectualsites.plotsquared; package com.plotsquared;
import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; import com.plotsquared.configuration.ConfigurationSection;
import com.github.intellectualsites.plotsquared.configuration.MemorySection; import com.plotsquared.configuration.MemorySection;
import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; import com.plotsquared.configuration.file.YamlConfiguration;
import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerialization; import com.plotsquared.configuration.serialization.ConfigurationSerialization;
import com.github.intellectualsites.plotsquared.player.ConsolePlayer; import com.plotsquared.location.Location;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.ConsolePlayer;
import com.github.intellectualsites.plotsquared.commands.WE_Anywhere; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.config.Caption; import com.plotsquared.commands.WE_Anywhere;
import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; import com.plotsquared.config.Caption;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.CaptionUtility;
import com.github.intellectualsites.plotsquared.plot.config.Configuration; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.config.Configuration;
import com.github.intellectualsites.plotsquared.plot.config.Storage; import com.plotsquared.config.Settings;
import com.github.intellectualsites.plotsquared.database.DBFunc; import com.plotsquared.config.Storage;
import com.github.intellectualsites.plotsquared.database.Database; import com.plotsquared.database.DBFunc;
import com.github.intellectualsites.plotsquared.database.MySQL; import com.plotsquared.database.Database;
import com.github.intellectualsites.plotsquared.database.SQLManager; import com.plotsquared.database.MySQL;
import com.github.intellectualsites.plotsquared.database.SQLite; import com.plotsquared.database.SQLManager;
import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; import com.plotsquared.database.SQLite;
import com.github.intellectualsites.plotsquared.generator.HybridPlotWorld; import com.plotsquared.generator.GeneratorWrapper;
import com.github.intellectualsites.plotsquared.generator.HybridUtils; import com.plotsquared.generator.HybridPlotWorld;
import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; import com.plotsquared.generator.HybridUtils;
import com.github.intellectualsites.plotsquared.listener.WESubscriber; import com.plotsquared.generator.IndependentPlotGenerator;
import com.github.intellectualsites.plotsquared.plot.comment.CommentManager; import com.plotsquared.listener.WESubscriber;
import com.github.intellectualsites.plotsquared.util.ChatManager; import com.plotsquared.plot.comment.CommentManager;
import com.github.intellectualsites.plotsquared.util.ChunkManager; import com.plotsquared.util.ChatManager;
import com.github.intellectualsites.plotsquared.util.EconHandler; import com.plotsquared.plot.BlockBucket;
import com.github.intellectualsites.plotsquared.util.EventDispatcher; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.util.LegacyConverter; import com.plotsquared.plot.PlotArea;
import com.github.intellectualsites.plotsquared.util.MathMan; import com.plotsquared.plot.PlotAreaType;
import com.github.intellectualsites.plotsquared.util.SchematicHandler; import com.plotsquared.plot.PlotCluster;
import com.github.intellectualsites.plotsquared.util.StringMan; import com.plotsquared.plot.PlotFilter;
import com.github.intellectualsites.plotsquared.util.logger.ILogger; import com.plotsquared.plot.PlotId;
import com.github.intellectualsites.plotsquared.plot.object.*; import com.plotsquared.plot.PlotManager;
import com.github.intellectualsites.plotsquared.plot.object.worlds.DefaultPlotAreaManager; import com.plotsquared.util.StringWrapper;
import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; import com.plotsquared.util.ChunkManager;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; import com.plotsquared.util.EconHandler;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; import com.plotsquared.util.EventDispatcher;
import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; import com.plotsquared.util.LegacyConverter;
import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; import com.plotsquared.util.MathMan;
import com.github.intellectualsites.plotsquared.plot.expiration.ExpiryTask; import com.plotsquared.util.SchematicHandler;
import com.github.intellectualsites.plotsquared.util.InventoryUtil; import com.plotsquared.util.StringMan;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.logger.ILogger;
import com.github.intellectualsites.plotsquared.util.ReflectionUtils; import com.plotsquared.plot.worlds.DefaultPlotAreaManager;
import com.github.intellectualsites.plotsquared.util.SetupUtils; import com.plotsquared.plot.worlds.PlotAreaManager;
import com.github.intellectualsites.plotsquared.util.WorldUtil; import com.plotsquared.plot.worlds.SinglePlotArea;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.plot.worlds.SinglePlotAreaManager;
import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.plotsquared.queue.GlobalBlockQueue;
import com.plotsquared.plot.expiration.ExpireManager;
import com.plotsquared.plot.expiration.ExpiryTask;
import com.plotsquared.util.InventoryUtil;
import com.plotsquared.util.MainUtil;
import com.plotsquared.util.ReflectionUtils;
import com.plotsquared.util.SetupUtils;
import com.plotsquared.util.WorldUtil;
import com.plotsquared.util.uuid.UUIDHandler;
import com.plotsquared.util.tasks.TaskManager;
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;

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

@ -1,4 +1,4 @@
package com.github.intellectualsites.plotsquared; package com.plotsquared;
public class PlotVersion { public class PlotVersion {
public final int year, month, day, hash, build; public final int year, month, day, hash, build;

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

@ -1,19 +1,20 @@
package com.github.intellectualsites.plotsquared.api; package com.plotsquared.api;
import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; import com.plotsquared.configuration.file.YamlConfiguration;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Caption; import com.plotsquared.config.Caption;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.plot.PlotArea;
import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.ChunkManager; import com.plotsquared.queue.GlobalBlockQueue;
import com.github.intellectualsites.plotsquared.util.EventDispatcher; import com.plotsquared.util.ChunkManager;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.EventDispatcher;
import com.github.intellectualsites.plotsquared.util.SchematicHandler; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.util.SchematicHandler;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; import com.plotsquared.util.uuid.UUIDHandler;
import com.plotsquared.util.uuid.UUIDWrapper;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.util.Collections; import java.util.Collections;
@ -27,7 +28,7 @@ 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>

2
Core/src/main/java/com/github/intellectualsites/plotsquared/collection/AbstractDelegateOutputStream.java → Core/src/main/java/com/plotsquared/collection/AbstractDelegateOutputStream.java
View File

@ -1,4 +1,4 @@
package com.github.intellectualsites.plotsquared.collection; package com.plotsquared.collection;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;

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

@ -1,4 +1,4 @@
package com.github.intellectualsites.plotsquared.collection; package com.plotsquared.collection;
import java.util.Arrays; import java.util.Arrays;

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

@ -1,6 +1,6 @@
package com.github.intellectualsites.plotsquared.collection; package com.plotsquared.collection;
import com.github.intellectualsites.plotsquared.util.MathMan; import com.plotsquared.util.MathMan;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;

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

@ -1,4 +1,4 @@
package com.github.intellectualsites.plotsquared.collection; package com.plotsquared.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/collection/SimpleRandomCollection.java → Core/src/main/java/com/plotsquared/collection/SimpleRandomCollection.java
View File

@ -1,4 +1,4 @@
package com.github.intellectualsites.plotsquared.collection; package com.plotsquared.collection;
import java.util.Map; import java.util.Map;
import java.util.NavigableMap; import java.util.NavigableMap;

20
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Add.java → Core/src/main/java/com/plotsquared/commands/Add.java
View File

@ -1,14 +1,14 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.database.DBFunc; import com.plotsquared.database.DBFunc;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; import com.plotsquared.util.tasks.RunnableVal2;
import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; import com.plotsquared.util.tasks.RunnableVal3;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.Permissions; import com.plotsquared.util.Permissions;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;

22
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Alias.java → Core/src/main/java/com/plotsquared/commands/Alias.java
View File

@ -1,15 +1,15 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; import com.plotsquared.util.StringWrapper;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.MathMan; import com.plotsquared.util.MathMan;
import com.github.intellectualsites.plotsquared.util.Permissions; import com.plotsquared.util.Permissions;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.util.uuid.UUIDHandler;
@CommandDeclaration(command = "setalias", @CommandDeclaration(command = "setalias",
permission = "plots.alias", permission = "plots.alias",

52
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Area.java → Core/src/main/java/com/plotsquared/commands/Area.java
View File

@ -1,30 +1,30 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; import com.plotsquared.configuration.ConfigurationSection;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Configuration; import com.plotsquared.config.Configuration;
import com.github.intellectualsites.plotsquared.generator.AugmentedUtils; import com.plotsquared.generator.AugmentedUtils;
import com.github.intellectualsites.plotsquared.generator.HybridPlotWorld; import com.plotsquared.generator.HybridPlotWorld;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.PlotAreaTerrainType; import com.plotsquared.plot.PlotAreaTerrainType;
import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; import com.plotsquared.plot.PlotAreaType;
import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.plotsquared.plot.PlotId;
import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; import com.plotsquared.plot.message.PlotMessage;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.plotsquared.util.tasks.RunnableVal;
import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; import com.plotsquared.util.tasks.RunnableVal3;
import com.github.intellectualsites.plotsquared.plot.object.SetupObject; import com.plotsquared.plot.SetupObject;
import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; import com.plotsquared.events.TeleportCause;
import com.github.intellectualsites.plotsquared.util.ChunkManager; import com.plotsquared.util.ChunkManager;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.MathMan; import com.plotsquared.util.MathMan;
import com.github.intellectualsites.plotsquared.util.Permissions; import com.plotsquared.util.Permissions;
import com.github.intellectualsites.plotsquared.util.SetupUtils; import com.plotsquared.util.SetupUtils;
import com.github.intellectualsites.plotsquared.util.StringMan; import com.plotsquared.util.StringMan;
import com.github.intellectualsites.plotsquared.util.WorldUtil; import com.plotsquared.util.WorldUtil;
import com.github.intellectualsites.plotsquared.util.RegionUtil; import com.plotsquared.util.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;

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

@ -1,6 +1,6 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.plotsquared.plot.PlotId;
public abstract class Argument<T> { public abstract class Argument<T> {

44
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Auto.java → Core/src/main/java/com/plotsquared/commands/Auto.java
View File

@ -1,26 +1,26 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; import com.plotsquared.config.CaptionUtility;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.config.Settings;
import com.github.intellectualsites.plotsquared.database.DBFunc; import com.plotsquared.database.DBFunc;
import com.github.intellectualsites.plotsquared.events.PlayerAutoPlotEvent; import com.plotsquared.events.PlayerAutoPlotEvent;
import com.github.intellectualsites.plotsquared.events.PlotAutoMergeEvent; import com.plotsquared.events.PlotAutoMergeEvent;
import com.github.intellectualsites.plotsquared.events.Result; import com.plotsquared.events.Result;
import com.github.intellectualsites.plotsquared.plot.object.Expression; import com.plotsquared.util.Expression;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; import com.plotsquared.plot.PlotAreaType;
import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.plotsquared.plot.PlotId;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.plotsquared.util.tasks.RunnableVal;
import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; import com.plotsquared.events.TeleportCause;
import com.github.intellectualsites.plotsquared.util.tasks.AutoClaimFinishTask; import com.plotsquared.util.tasks.AutoClaimFinishTask;
import com.github.intellectualsites.plotsquared.util.EconHandler; import com.plotsquared.util.EconHandler;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.Permissions; import com.plotsquared.util.Permissions;
import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.plotsquared.util.tasks.TaskManager;
import com.google.common.primitives.Ints; import com.google.common.primitives.Ints;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;

12
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Biome.java → Core/src/main/java/com/plotsquared/commands/Biome.java
View File

@ -1,10 +1,10 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.StringMan; import com.plotsquared.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;

31
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Buy.java → Core/src/main/java/com/plotsquared/commands/Buy.java
View File

@ -1,18 +1,18 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.events.PlotFlagRemoveEvent; import com.plotsquared.events.PlotFlagRemoveEvent;
import com.github.intellectualsites.plotsquared.events.Result; import com.plotsquared.events.Result;
import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.plotsquared.plot.flags.PlotFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.PriceFlag; import com.plotsquared.plot.flags.implementations.PriceFlag;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; import com.plotsquared.util.tasks.RunnableVal2;
import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; import com.plotsquared.util.tasks.RunnableVal3;
import com.github.intellectualsites.plotsquared.util.EconHandler; import com.plotsquared.util.EconHandler;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.util.uuid.UUIDHandler;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
@ -63,7 +63,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());
} }

4
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Chat.java → Core/src/main/java/com/plotsquared/commands/Chat.java
View File

@ -1,6 +1,6 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
@CommandDeclaration(command = "chat", @CommandDeclaration(command = "chat",
description = "Toggle plot chat on or off", description = "Toggle plot chat on or off",

37
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Claim.java → Core/src/main/java/com/plotsquared/commands/Claim.java
View File

@ -1,20 +1,24 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; import com.plotsquared.config.CaptionUtility;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.config.Settings;
import com.github.intellectualsites.plotsquared.database.DBFunc; import com.plotsquared.database.DBFunc;
import com.github.intellectualsites.plotsquared.events.PlayerClaimPlotEvent; import com.plotsquared.events.PlayerClaimPlotEvent;
import com.github.intellectualsites.plotsquared.events.PlotMergeEvent; import com.plotsquared.events.PlotMergeEvent;
import com.github.intellectualsites.plotsquared.events.Result; import com.plotsquared.events.Result;
import com.github.intellectualsites.plotsquared.plot.object.*; import com.plotsquared.util.EconHandler;
import com.github.intellectualsites.plotsquared.util.EconHandler; import com.plotsquared.util.Permissions;
import com.github.intellectualsites.plotsquared.util.Permissions; import com.plotsquared.util.tasks.TaskManager;
import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.plotsquared.util.tasks.RunnableVal;
import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal;
import com.google.common.primitives.Ints; import com.google.common.primitives.Ints;
import com.plotsquared.location.Direction;
import com.plotsquared.util.Expression;
import com.plotsquared.location.Location;
import com.plotsquared.plot.Plot;
import com.plotsquared.plot.PlotArea;
@CommandDeclaration(command = "claim", @CommandDeclaration(command = "claim",
aliases = "c", aliases = "c",
@ -35,7 +39,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");

34
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Clear.java → Core/src/main/java/com/plotsquared/commands/Clear.java
View File

@ -1,24 +1,24 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.config.Settings;
import com.github.intellectualsites.plotsquared.events.PlotFlagRemoveEvent; import com.plotsquared.events.PlotFlagRemoveEvent;
import com.github.intellectualsites.plotsquared.events.Result; import com.plotsquared.events.Result;
import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.plotsquared.plot.flags.PlotFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnalysisFlag; import com.plotsquared.plot.flags.implementations.AnalysisFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; import com.plotsquared.plot.flags.implementations.DoneFlag;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; import com.plotsquared.util.tasks.RunnableVal2;
import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; import com.plotsquared.util.tasks.RunnableVal3;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.Permissions; import com.plotsquared.util.Permissions;
import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; import com.plotsquared.queue.GlobalBlockQueue;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import static com.github.intellectualsites.plotsquared.commands.SubCommand.sendMessage; import static com.plotsquared.commands.SubCommand.sendMessage;
@CommandDeclaration(command = "clear", @CommandDeclaration(command = "clear",
description = "Clear the plot you stand on", description = "Clear the plot you stand on",

32
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Cluster.java → Core/src/main/java/com/plotsquared/commands/Cluster.java
View File

@ -1,20 +1,20 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.config.Settings;
import com.github.intellectualsites.plotsquared.database.DBFunc; import com.plotsquared.database.DBFunc;
import com.github.intellectualsites.plotsquared.plot.object.BlockLoc; import com.plotsquared.location.BlockLoc;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.PlotCluster; import com.plotsquared.plot.PlotCluster;
import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.plotsquared.plot.PlotId;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; import com.plotsquared.events.TeleportCause;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.Permissions; import com.plotsquared.util.Permissions;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.util.uuid.UUIDHandler;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;

11
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CmdConfirm.java → Core/src/main/java/com/plotsquared/commands/CmdConfirm.java
View File

@ -1,10 +1,9 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.commands.CmdInstance; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.tasks.TaskManager;
import com.github.intellectualsites.plotsquared.util.tasks.TaskManager;
public class CmdConfirm { public class CmdConfirm {

2
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CmdInstance.java → Core/src/main/java/com/plotsquared/commands/CmdInstance.java
View File

@ -1,4 +1,4 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
public class CmdInstance { public class CmdInstance {
public final Runnable command; public final Runnable command;

26
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java → Core/src/main/java/com/plotsquared/commands/Command.java
View File

@ -1,17 +1,17 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; import com.plotsquared.configuration.file.YamlConfiguration;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; import com.plotsquared.plot.message.PlotMessage;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; import com.plotsquared.util.tasks.RunnableVal2;
import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; import com.plotsquared.util.tasks.RunnableVal3;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.MathMan; import com.plotsquared.util.MathMan;
import com.github.intellectualsites.plotsquared.util.Permissions; import com.plotsquared.util.Permissions;
import com.github.intellectualsites.plotsquared.util.StringComparison; import com.plotsquared.util.StringComparison;
import com.github.intellectualsites.plotsquared.util.StringMan; import com.plotsquared.util.StringMan;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;

2
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java → Core/src/main/java/com/plotsquared/commands/CommandCaller.java
View File

@ -1,4 +1,4 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
public interface CommandCaller { public interface CommandCaller {

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

@ -1,6 +1,6 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
/** /**

2
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java → Core/src/main/java/com/plotsquared/commands/CommandDeclaration.java
View File

@ -1,4 +1,4 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

20
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Comment.java → Core/src/main/java/com/plotsquared/commands/Comment.java
View File

@ -1,14 +1,14 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.comment.CommentInbox; import com.plotsquared.plot.comment.CommentInbox;
import com.github.intellectualsites.plotsquared.plot.comment.PlotComment; import com.plotsquared.plot.comment.PlotComment;
import com.github.intellectualsites.plotsquared.plot.comment.CommentManager; import com.plotsquared.plot.comment.CommentManager;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.StringMan; import com.plotsquared.util.StringMan;
import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.util.uuid.UUIDHandler;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale; import java.util.Locale;

20
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Condense.java → Core/src/main/java/com/plotsquared/commands/Condense.java
View File

@ -1,14 +1,14 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.plotsquared.plot.PlotId;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.MathMan; import com.plotsquared.util.MathMan;
import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.plotsquared.util.tasks.TaskManager;
import com.github.intellectualsites.plotsquared.util.WorldUtil; import com.plotsquared.util.WorldUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;

12
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Confirm.java → Core/src/main/java/com/plotsquared/commands/Confirm.java
View File

@ -1,10 +1,10 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.config.Settings;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.plotsquared.util.tasks.TaskManager;
@CommandDeclaration(command = "confirm", @CommandDeclaration(command = "confirm",
permission = "plots.use", permission = "plots.use",

24
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Continue.java → Core/src/main/java/com/plotsquared/commands/Continue.java
View File

@ -1,16 +1,16 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.plotsquared.config.Settings;
import com.github.intellectualsites.plotsquared.events.PlotFlagRemoveEvent; import com.plotsquared.events.PlotFlagRemoveEvent;
import com.github.intellectualsites.plotsquared.events.Result; import com.plotsquared.events.Result;
import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.plotsquared.plot.flags.PlotFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; import com.plotsquared.plot.flags.implementations.DoneFlag;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.Permissions; import com.plotsquared.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",

14
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Copy.java → Core/src/main/java/com/plotsquared/commands/Copy.java
View File

@ -1,11 +1,11 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.Permissions; import com.plotsquared.util.Permissions;
@CommandDeclaration(command = "copy", @CommandDeclaration(command = "copy",
permission = "plots.copy", permission = "plots.copy",

16
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CreateRoadSchematic.java → Core/src/main/java/com/plotsquared/commands/CreateRoadSchematic.java
View File

@ -1,12 +1,12 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.plotsquared.config.Captions;
import com.github.intellectualsites.plotsquared.generator.HybridPlotWorld; import com.plotsquared.generator.HybridPlotWorld;
import com.github.intellectualsites.plotsquared.generator.HybridUtils; import com.plotsquared.generator.HybridUtils;
import com.github.intellectualsites.plotsquared.plot.object.Location; import com.plotsquared.location.Location;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
@CommandDeclaration(command = "createroadschematic", @CommandDeclaration(command = "createroadschematic",
aliases = {"crs"}, aliases = {"crs"},

29
Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DatabaseCommand.java → Core/src/main/java/com/plotsquared/commands/DatabaseCommand.java
View File

@ -1,17 +1,18 @@
package com.github.intellectualsites.plotsquared.commands; package com.plotsquared.commands;
import com.github.intellectualsites.plotsquared.PlotSquared; import com.plotsquared.PlotSquared;
import com.github.intellectualsites.plotsquared.database.DBFunc; import com.plotsquared.database.DBFunc;
import com.github.intellectualsites.plotsquared.database.MySQL; import com.plotsquared.database.MySQL;
import com.github.intellectualsites.plotsquared.database.SQLManager; import com.plotsquared.database.SQLManager;
import com.github.intellectualsites.plotsquared.database.SQLite; import com.plotsquared.database.SQLite;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.plotsquared.plot.Plot;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.plotsquared.plot.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.plotsquared.plot.PlotId;
import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.plotsquared.player.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; import com.plotsquared.plot.worlds.SinglePlotArea;
import com.github.intellectualsites.plotsquared.util.MainUtil; import com.plotsquared.util.MainUtil;
import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.plotsquared.util.tasks.TaskManager;
import com.plotsquared.database.Database;
import java.io.File; import java.io.File;
import java.sql.SQLException; import java.sql.SQLException;
@ -67,7 +68,7 @@ public class DatabaseCommand extends SubCommand {
return false; return false;
} }
try { try {
com.github.intellectualsites.plotsquared.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