TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2024-12-23 00:15:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge config packages

Browse source
This commit is contained in:
Alexander Söderberg 2020-04-16 06:14:33 +02:00
parent edaf396894
commit ee2ed8222d
No known key found for this signature in database
GPG key ID: C0207FF7EA146678
222 changed files with 341 additions and 344 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
View file

@ -52,10 +52,10 @@ import com.plotsquared.bukkit.util.uuid.SQLUUIDHandler;
import com.plotsquared.core.configuration.ConfigurationSection;
import com.plotsquared.core.IPlotMain;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.ChatFormatter;
import com.plotsquared.core.config.ConfigurationNode;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.ChatFormatter;
import com.plotsquared.core.configuration.ConfigurationNode;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.generator.GeneratorWrapper;
import com.plotsquared.core.generator.HybridGen;
import com.plotsquared.core.generator.HybridUtils;

2
Bukkit/src/main/java/com/plotsquared/bukkit/command/DebugUUID.java
View file

@ -35,7 +35,7 @@ import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.command.CommandCategory;
import com.plotsquared.core.command.RequiredType;
import com.plotsquared.core.command.SubCommand;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.player.OfflinePlotPlayer;
import com.plotsquared.core.plot.Plot;

2
Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.bukkit.listener;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.util.ReflectionUtils.RefClass;

2
Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java
View file

@ -27,7 +27,7 @@ package com.plotsquared.bukkit.listener;
import com.plotsquared.bukkit.util.BukkitUtil;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;

2
Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java
View file

@ -27,7 +27,7 @@ package com.plotsquared.bukkit.listener;
import com.plotsquared.bukkit.player.BukkitPlayer;
import com.plotsquared.bukkit.util.BukkitUtil;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.plot.flag.implementations.ForcefieldFlag;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;

4
Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
View file

@ -30,8 +30,8 @@ import com.plotsquared.bukkit.player.BukkitPlayer;
import com.plotsquared.bukkit.util.BukkitUtil;
import com.plotsquared.bukkit.util.UpdateUtility;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.plot.flag.implementations.AnimalAttackFlag;
import com.plotsquared.core.plot.flag.implementations.AnimalCapFlag;

2
Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PlaceholderFormatter.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.bukkit.placeholder;
import com.plotsquared.bukkit.player.BukkitPlayer;
import com.plotsquared.core.config.ChatFormatter;
import com.plotsquared.core.configuration.ChatFormatter;
import com.plotsquared.core.player.PlotPlayer;
import me.clip.placeholderapi.PlaceholderAPI;
import org.bukkit.entity.Player;

2
Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
View file

@ -27,7 +27,7 @@ package com.plotsquared.bukkit.player;
import com.plotsquared.bukkit.util.BukkitUtil;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.events.TeleportCause;

2
Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java
View file

@ -27,7 +27,7 @@ package com.plotsquared.bukkit.schematic;
import com.plotsquared.bukkit.util.BukkitUtil;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.sk89q.jnbt.ByteTag;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.ListTag;

4
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java
View file

@ -27,8 +27,8 @@ package com.plotsquared.bukkit.util;
import com.plotsquared.bukkit.chat.FancyMessage;
import com.plotsquared.bukkit.player.BukkitPlayer;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.player.ConsolePlayer;
import com.plotsquared.core.plot.message.PlotMessage;
import com.plotsquared.core.player.PlotPlayer;

2
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java
View file

@ -29,7 +29,7 @@ import com.plotsquared.bukkit.generator.BukkitPlotGenerator;
import com.plotsquared.core.configuration.ConfigurationSection;
import com.plotsquared.core.configuration.file.YamlConfiguration;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.ConfigurationNode;
import com.plotsquared.core.configuration.ConfigurationNode;
import com.plotsquared.core.generator.GeneratorWrapper;
import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.plot.PlotAreaType;

2
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
View file

@ -28,7 +28,7 @@ package com.plotsquared.bukkit.util;
import com.plotsquared.bukkit.BukkitMain;
import com.plotsquared.bukkit.player.BukkitPlayer;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.player.PlotPlayer;

4
Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java
View file

@ -26,8 +26,8 @@
package com.plotsquared.bukkit.util;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import org.bukkit.Bukkit;
import org.bukkit.event.Listener;
import org.bukkit.plugin.java.JavaPlugin;

4
Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/FileUUIDHandler.java
View file

@ -28,8 +28,8 @@ package com.plotsquared.bukkit.util.uuid;
import com.google.common.collect.HashBiMap;
import com.google.common.collect.Sets;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.player.OfflinePlotPlayer;
import com.plotsquared.core.plot.expiration.ExpireManager;
import com.plotsquared.core.util.StringMan;

4
Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/SQLUUIDHandler.java
View file

@ -26,8 +26,8 @@
package com.plotsquared.bukkit.util.uuid;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.database.SQLite;
import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.core.util.StringWrapper;

30
Core/src/main/java/com/plotsquared/core/PlotSquared.java
View file

@ -26,12 +26,12 @@
package com.plotsquared.core;
import com.plotsquared.core.command.WE_Anywhere;
import com.plotsquared.core.config.Caption;
import com.plotsquared.core.config.CaptionUtility;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Configuration;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.config.Storage;
import com.plotsquared.core.configuration.Caption;
import com.plotsquared.core.configuration.CaptionUtility;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.ConfigurationUtil;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.Storage;
import com.plotsquared.core.configuration.ConfigurationSection;
import com.plotsquared.core.configuration.MemorySection;
import com.plotsquared.core.configuration.file.YamlConfiguration;
@ -1449,41 +1449,41 @@ import java.util.zip.ZipInputStream;
case "s":
case "size":
this.worlds.set(base + "plot.size",
Configuration.INTEGER.parseString(value).shortValue());
ConfigurationUtil.INTEGER.parseString(value).shortValue());
break;
case "g":
case "gap":
this.worlds.set(base + "road.width",
Configuration.INTEGER.parseString(value).shortValue());
ConfigurationUtil.INTEGER.parseString(value).shortValue());
break;
case "h":
case "height":
this.worlds.set(base + "road.height",
Configuration.INTEGER.parseString(value).shortValue());
ConfigurationUtil.INTEGER.parseString(value).shortValue());
this.worlds.set(base + "plot.height",
Configuration.INTEGER.parseString(value).shortValue());
ConfigurationUtil.INTEGER.parseString(value).shortValue());
this.worlds.set(base + "wall.height",
Configuration.INTEGER.parseString(value).shortValue());
ConfigurationUtil.INTEGER.parseString(value).shortValue());
break;
case "f":
case "floor":
this.worlds.set(base + "plot.floor",
Configuration.BLOCK_BUCKET.parseString(value).toString());
ConfigurationUtil.BLOCK_BUCKET.parseString(value).toString());
break;
case "m":
case "main":
this.worlds.set(base + "plot.filling",
Configuration.BLOCK_BUCKET.parseString(value).toString());
ConfigurationUtil.BLOCK_BUCKET.parseString(value).toString());
break;
case "w":
case "wall":
this.worlds.set(base + "wall.filling",
Configuration.BLOCK_BUCKET.parseString(value).toString());
ConfigurationUtil.BLOCK_BUCKET.parseString(value).toString());
break;
case "b":
case "border":
this.worlds.set(base + "wall.block",
Configuration.BLOCK_BUCKET.parseString(value).toString());
ConfigurationUtil.BLOCK_BUCKET.parseString(value).toString());
break;
default:
PlotSquared.log("&cKey not found: &7" + element);

4
Core/src/main/java/com/plotsquared/core/api/PlotAPI.java
View file

@ -27,8 +27,8 @@ package com.plotsquared.core.api;
import com.plotsquared.core.configuration.file.YamlConfiguration;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Caption;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Caption;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;

2
Core/src/main/java/com/plotsquared/core/command/Add.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.player.PlotPlayer;

2
Core/src/main/java/com/plotsquared/core/command/Alias.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.player.PlotPlayer;

12
Core/src/main/java/com/plotsquared/core/command/Area.java
View file

@ -27,8 +27,8 @@ package com.plotsquared.core.command;
import com.plotsquared.core.configuration.ConfigurationSection;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Configuration;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.ConfigurationUtil;
import com.plotsquared.core.generator.AugmentedUtils;
import com.plotsquared.core.generator.HybridPlotWorld;
import com.plotsquared.core.location.Location;
@ -239,20 +239,20 @@ public class Area extends SubCommand {
break;
case "f":
case "floor":
pa.TOP_BLOCK = Configuration.BLOCK_BUCKET.parseString(pair[1]);
pa.TOP_BLOCK = ConfigurationUtil.BLOCK_BUCKET.parseString(pair[1]);
break;
case "m":
case "main":
pa.MAIN_BLOCK = Configuration.BLOCK_BUCKET.parseString(pair[1]);
pa.MAIN_BLOCK = ConfigurationUtil.BLOCK_BUCKET.parseString(pair[1]);
break;
case "w":
case "wall":
pa.WALL_FILLING =
Configuration.BLOCK_BUCKET.parseString(pair[1]);
ConfigurationUtil.BLOCK_BUCKET.parseString(pair[1]);
break;
case "b":
case "border":
pa.WALL_BLOCK = Configuration.BLOCK_BUCKET.parseString(pair[1]);
pa.WALL_BLOCK = ConfigurationUtil.BLOCK_BUCKET.parseString(pair[1]);
break;
case "terrain":
pa.setTerrain(PlotAreaTerrainType.fromString(pair[1]).orElseThrow(() -> new IllegalArgumentException(pair[1] + " is not a valid terrain.")));

6
Core/src/main/java/com/plotsquared/core/command/Auto.java
View file

@ -26,9 +26,9 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.CaptionUtility;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.CaptionUtility;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.events.PlayerAutoPlotEvent;
import com.plotsquared.core.events.PlotAutoMergeEvent;

2
Core/src/main/java/com/plotsquared/core/command/Biome.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.MainUtil;

2
Core/src/main/java/com/plotsquared/core/command/Buy.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.core.events.Result;
import com.plotsquared.core.plot.flag.PlotFlag;

2
Core/src/main/java/com/plotsquared/core/command/Caps.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.flag.PlotFlag;

6
Core/src/main/java/com/plotsquared/core/command/Claim.java
View file

@ -27,9 +27,9 @@ package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.config.CaptionUtility;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.CaptionUtility;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.events.PlayerClaimPlotEvent;
import com.plotsquared.core.events.PlotMergeEvent;

4
Core/src/main/java/com/plotsquared/core/command/Clear.java
View file

@ -26,8 +26,8 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.core.events.Result;
import com.plotsquared.core.plot.flag.PlotFlag;

4
Core/src/main/java/com/plotsquared/core/command/Cluster.java
View file

@ -26,8 +26,8 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.location.BlockLoc;
import com.plotsquared.core.location.Location;

2
Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.MainUtil;
import com.plotsquared.core.util.task.TaskManager;

2
Core/src/main/java/com/plotsquared/core/command/Command.java
View file

@ -27,7 +27,7 @@ package com.plotsquared.core.command;
import com.plotsquared.core.configuration.file.YamlConfiguration;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.plot.message.PlotMessage;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.task.RunnableVal2;

2
Core/src/main/java/com/plotsquared/core/command/CommandCategory.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import lombok.RequiredArgsConstructor;
/**

2
Core/src/main/java/com/plotsquared/core/command/Comment.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.comment.CommentInbox;

4
Core/src/main/java/com/plotsquared/core/command/Confirm.java
View file

@ -25,8 +25,8 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.MainUtil;
import com.plotsquared.core.util.task.TaskManager;

4
Core/src/main/java/com/plotsquared/core/command/Continue.java
View file

@ -26,8 +26,8 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.core.events.Result;
import com.plotsquared.core.plot.flag.PlotFlag;

2
Core/src/main/java/com/plotsquared/core/command/Copy.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.player.PlotPlayer;

2
Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.generator.HybridPlotWorld;
import com.plotsquared.core.generator.HybridUtils;
import com.plotsquared.core.location.Location;

2
Core/src/main/java/com/plotsquared/core/command/Debug.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.ChunkManager;
import com.plotsquared.core.util.MainUtil;

2
Core/src/main/java/com/plotsquared/core/command/DebugAllowUnsafe.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.player.PlotPlayer;
import java.util.ArrayList;

2
Core/src/main/java/com/plotsquared/core/command/DebugClaimTest.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;

4
Core/src/main/java/com/plotsquared/core/command/DebugExec.java
View file

@ -26,8 +26,8 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.core.events.Result;

4
Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
View file

@ -26,8 +26,8 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.net.IncendoPaster;
import com.plotsquared.core.util.MainUtil;

2
Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.generator.HybridPlotManager;
import com.plotsquared.core.generator.HybridUtils;
import com.plotsquared.core.location.Location;

4
Core/src/main/java/com/plotsquared/core/command/Delete.java
View file

@ -26,8 +26,8 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.events.Result;
import com.plotsquared.core.util.Expression;
import com.plotsquared.core.location.Location;

2
Core/src/main/java/com/plotsquared/core/command/Deny.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;

2
Core/src/main/java/com/plotsquared/core/command/Desc.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.events.PlotFlagAddEvent;
import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.core.events.Result;

4
Core/src/main/java/com/plotsquared/core/command/Done.java
View file

@ -26,8 +26,8 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.events.PlotDoneEvent;
import com.plotsquared.core.events.PlotFlagAddEvent;
import com.plotsquared.core.events.Result;

4
Core/src/main/java/com/plotsquared/core/command/Download.java
View file

@ -26,8 +26,8 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.player.PlotPlayer;

6
Core/src/main/java/com/plotsquared/core/command/FlagCommand.java
View file

@ -26,9 +26,9 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.CaptionUtility;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.CaptionUtility;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.events.PlotFlagAddEvent;
import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.core.events.Result;

4
Core/src/main/java/com/plotsquared/core/command/Grant.java
View file

@ -25,8 +25,8 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.CaptionUtility;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.CaptionUtility;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.task.RunnableVal;

2
Core/src/main/java/com/plotsquared/core/command/Help.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;

2
Core/src/main/java/com/plotsquared/core/command/Inbox.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.task.RunnableVal;

4
Core/src/main/java/com/plotsquared/core/command/Info.java
View file

@ -25,8 +25,8 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.plot.flag.implementations.HideInfoFlag;
import com.plotsquared.core.plot.Plot;

2
Core/src/main/java/com/plotsquared/core/command/Kick.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;

2
Core/src/main/java/com/plotsquared/core/command/Leave.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.task.RunnableVal2;

4
Core/src/main/java/com/plotsquared/core/command/Like.java
View file

@ -26,8 +26,8 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.events.PlotRateEvent;
import com.plotsquared.core.plot.flag.implementations.DoneFlag;

4
Core/src/main/java/com/plotsquared/core/command/ListCmd.java
View file

@ -27,8 +27,8 @@ package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.PlotSquared.SortType;
import com.plotsquared.core.config.CaptionUtility;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.CaptionUtility;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.core.plot.flag.implementations.PriceFlag;
import com.plotsquared.core.plot.Plot;

4
Core/src/main/java/com/plotsquared/core/command/Load.java
View file

@ -26,8 +26,8 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.plot.PlotId;

4
Core/src/main/java/com/plotsquared/core/command/MainCommand.java
View file

@ -25,8 +25,8 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.player.ConsolePlayer;
import com.plotsquared.core.util.Expression;
import com.plotsquared.core.location.Location;

4
Core/src/main/java/com/plotsquared/core/command/Merge.java
View file

@ -26,8 +26,8 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.events.PlotMergeEvent;
import com.plotsquared.core.events.Result;
import com.plotsquared.core.location.Direction;

2
Core/src/main/java/com/plotsquared/core/command/Middle.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.player.PlotPlayer;

2
Core/src/main/java/com/plotsquared/core/command/Move.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;

2
Core/src/main/java/com/plotsquared/core/command/Music.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.events.PlotFlagAddEvent;
import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.core.events.Result;

2
Core/src/main/java/com/plotsquared/core/command/Near.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.task.RunnableVal2;

4
Core/src/main/java/com/plotsquared/core/command/Owner.java
View file

@ -26,8 +26,8 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.events.PlotChangeOwnerEvent;
import com.plotsquared.core.events.PlotUnlinkEvent;
import com.plotsquared.core.events.Result;

2
Core/src/main/java/com/plotsquared/core/command/Purge.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.listener.PlotListener;
import com.plotsquared.core.plot.Plot;

4
Core/src/main/java/com/plotsquared/core/command/Rate.java
View file

@ -26,8 +26,8 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.events.PlotRateEvent;
import com.plotsquared.core.plot.flag.implementations.DoneFlag;

2
Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.generator.HybridPlotManager;
import com.plotsquared.core.generator.HybridUtils;
import com.plotsquared.core.plot.PlotArea;

2
Core/src/main/java/com/plotsquared/core/command/Relight.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.task.RunnableVal;

2
Core/src/main/java/com/plotsquared/core/command/Reload.java
View file

@ -29,7 +29,7 @@ import com.plotsquared.core.configuration.ConfigurationSection;
import com.plotsquared.core.configuration.MemorySection;
import com.plotsquared.core.configuration.file.YamlConfiguration;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.plot.PlotAreaType;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.MainUtil;

2
Core/src/main/java/com/plotsquared/core/command/Remove.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;

2
Core/src/main/java/com/plotsquared/core/command/Save.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotId;

4
Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java
View file

@ -26,8 +26,8 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.player.ConsolePlayer;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;

4
Core/src/main/java/com/plotsquared/core/command/Set.java
View file

@ -25,8 +25,8 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.CaptionUtility;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.CaptionUtility;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotManager;
import com.plotsquared.core.player.PlotPlayer;

4
Core/src/main/java/com/plotsquared/core/command/SetCommand.java
View file

@ -25,8 +25,8 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.CaptionUtility;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.CaptionUtility;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.player.PlotPlayer;

2
Core/src/main/java/com/plotsquared/core/command/SetHome.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.location.BlockLoc;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;

8
Core/src/main/java/com/plotsquared/core/command/Setup.java
View file

@ -26,9 +26,9 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Configuration;
import com.plotsquared.core.config.ConfigurationNode;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.ConfigurationUtil;
import com.plotsquared.core.configuration.ConfigurationNode;
import com.plotsquared.core.generator.GeneratorWrapper;
import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.plot.PlotAreaTerrainType;
@ -311,7 +311,7 @@ public class Setup extends SubCommand {
boolean valid = false;
try {
valid = step.isValid(args[0]);
} catch (final Configuration.UnsafeBlockException e) {
} catch (final ConfigurationUtil.UnsafeBlockException e) {
Captions.NOT_ALLOWED_BLOCK.send(player, e.getUnsafeBlock().toString());
}
if (valid) {

2
Core/src/main/java/com/plotsquared/core/command/SubCommand.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;

2
Core/src/main/java/com/plotsquared/core/command/Swap.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.player.PlotPlayer;

2
Core/src/main/java/com/plotsquared/core/command/Target.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.player.PlotPlayer;

6
Core/src/main/java/com/plotsquared/core/command/Template.java
View file

@ -29,9 +29,9 @@ import com.plotsquared.core.configuration.ConfigurationSection;
import com.plotsquared.core.configuration.InvalidConfigurationException;
import com.plotsquared.core.configuration.file.YamlConfiguration;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.ConfigurationNode;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.ConfigurationNode;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.util.FileBytes;
import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.plot.PlotManager;

2
Core/src/main/java/com/plotsquared/core/command/Toggle.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;

2
Core/src/main/java/com/plotsquared/core/command/Trim.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.player.PlotPlayer;

2
Core/src/main/java/com/plotsquared/core/command/Trust.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.player.PlotPlayer;

2
Core/src/main/java/com/plotsquared/core/command/Unlink.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.events.PlotUnlinkEvent;
import com.plotsquared.core.events.Result;
import com.plotsquared.core.location.Location;

4
Core/src/main/java/com/plotsquared/core/command/Visit.java
View file

@ -26,8 +26,8 @@
package com.plotsquared.core.command;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.plot.flag.implementations.UntrustedVisitFlag;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;

2
Core/src/main/java/com/plotsquared/core/config/Caption.java → Core/src/main/java/com/plotsquared/core/configuration/Caption.java
View file

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.plotsquared.core.config;
package com.plotsquared.core.configuration;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.player.PlotPlayer;

2
Core/src/main/java/com/plotsquared/core/config/CaptionUtility.java → Core/src/main/java/com/plotsquared/core/configuration/CaptionUtility.java
View file

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

3
Core/src/main/java/com/plotsquared/core/config/Captions.java → Core/src/main/java/com/plotsquared/core/configuration/Captions.java
View file

@ -23,9 +23,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.plotsquared.core.config;
package com.plotsquared.core.configuration;
import com.plotsquared.core.configuration.ConfigurationSection;
import com.plotsquared.core.configuration.file.YamlConfiguration;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.util.StringMan;

2
Core/src/main/java/com/plotsquared/core/config/ChatFormatter.java → Core/src/main/java/com/plotsquared/core/configuration/ChatFormatter.java
View file

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.plotsquared.core.config;
package com.plotsquared.core.configuration;
import com.plotsquared.core.player.PlotPlayer;
import lombok.AllArgsConstructor;

5
Core/src/main/java/com/plotsquared/core/config/Config.java → Core/src/main/java/com/plotsquared/core/configuration/Config.java
View file

@ -23,12 +23,11 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.plotsquared.core.config;
package com.plotsquared.core.configuration;
import com.plotsquared.core.configuration.MemorySection;
import com.plotsquared.core.configuration.file.YamlConfiguration;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Settings.Enabled_Components;
import com.plotsquared.core.configuration.Settings.Enabled_Components;
import com.plotsquared.core.util.StringMan;
import java.io.File;

10
Core/src/main/java/com/plotsquared/core/config/ConfigurationNode.java → Core/src/main/java/com/plotsquared/core/configuration/ConfigurationNode.java
View file

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.plotsquared.core.config;
package com.plotsquared.core.configuration;
import com.plotsquared.core.plot.BlockBucket;
import com.plotsquared.core.util.StringMan;
@ -41,11 +41,11 @@ public class ConfigurationNode {
private final String constant;
private final Object defaultValue;
private final String description;
private final Configuration.SettingValue type;
private final ConfigurationUtil.SettingValue type;
private Object value;
public ConfigurationNode(String constant, Object defaultValue, String description,
Configuration.SettingValue type) {
ConfigurationUtil.SettingValue type) {
this.constant = constant;
this.defaultValue = defaultValue;
this.description = description;
@ -53,7 +53,7 @@ public class ConfigurationNode {
this.type = type;
}
public Configuration.SettingValue getType() {
public ConfigurationUtil.SettingValue getType() {
return this.type;
}
@ -62,7 +62,7 @@ public class ConfigurationNode {
Object result = this.type.parseString(string);
return result != null;
} catch (Exception e) {
if (e instanceof Configuration.UnknownBlockException) {
if (e instanceof ConfigurationUtil.UnknownBlockException) {
throw e;
}
return false;

4
Core/src/main/java/com/plotsquared/core/config/Configuration.java → Core/src/main/java/com/plotsquared/core/configuration/ConfigurationUtil.java
View file

@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.plotsquared.core.config;
package com.plotsquared.core.configuration;
import com.plotsquared.core.plot.BlockBucket;
import com.sk89q.worldedit.function.pattern.Pattern;
@ -36,7 +36,7 @@ import lombok.NonNull;
/**
* Main Configuration Utility
*/
public class Configuration {
public class ConfigurationUtil {
public static final SettingValue<Integer> INTEGER = new SettingValue<Integer>("INTEGER") {
@Override public boolean validateValue(String string) {

2
Core/src/main/java/com/plotsquared/core/config/PlotSquaredChatFormatter.java → Core/src/main/java/com/plotsquared/core/configuration/PlotSquaredChatFormatter.java
View file

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

2
Core/src/main/java/com/plotsquared/core/config/Settings.java → Core/src/main/java/com/plotsquared/core/configuration/Settings.java
View file

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

2
Core/src/main/java/com/plotsquared/core/config/StaticCaption.java → Core/src/main/java/com/plotsquared/core/configuration/StaticCaption.java
View file

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

2
Core/src/main/java/com/plotsquared/core/config/Storage.java → Core/src/main/java/com/plotsquared/core/configuration/Storage.java
View file

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

2
Core/src/main/java/com/plotsquared/core/database/MySQL.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.database;
import com.plotsquared.core.config.Storage;
import com.plotsquared.core.configuration.Storage;
import com.plotsquared.core.util.StringMan;
import java.sql.Connection;

6
Core/src/main/java/com/plotsquared/core/database/SQLManager.java
View file

@ -27,9 +27,9 @@ package com.plotsquared.core.database;
import com.plotsquared.core.configuration.ConfigurationSection;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Captions;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.config.Storage;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.Storage;
import com.plotsquared.core.plot.flag.FlagContainer;
import com.plotsquared.core.plot.flag.FlagParseException;
import com.plotsquared.core.plot.flag.GlobalFlagContainer;

2
Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java
View file

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.generator;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.plot.BlockBucket;
import com.plotsquared.core.location.Direction;
import com.plotsquared.core.location.Location;

30
Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java
View file

@ -27,9 +27,9 @@ package com.plotsquared.core.generator;
import com.plotsquared.core.configuration.ConfigurationSection;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Configuration;
import com.plotsquared.core.config.ConfigurationNode;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.ConfigurationUtil;
import com.plotsquared.core.configuration.ConfigurationNode;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.plot.BlockBucket;
import com.plotsquared.core.plot.PlotId;
import com.sk89q.worldedit.world.block.BlockTypes;
@ -72,29 +72,29 @@ import java.util.Locale;
@NotNull @Override public ConfigurationNode[] getSettingNodes() {
return new ConfigurationNode[] {
new ConfigurationNode("plot.height", this.PLOT_HEIGHT, "Plot height",
Configuration.INTEGER),
ConfigurationUtil.INTEGER),
new ConfigurationNode("plot.size", this.PLOT_WIDTH, "Plot width",
Configuration.INTEGER),
ConfigurationUtil.INTEGER),
new ConfigurationNode("plot.filling", this.MAIN_BLOCK, "Plot block",
Configuration.BLOCK_BUCKET),
ConfigurationUtil.BLOCK_BUCKET),
new ConfigurationNode("plot.floor", this.TOP_BLOCK, "Plot floor block",
Configuration.BLOCK_BUCKET),
ConfigurationUtil.BLOCK_BUCKET),
new ConfigurationNode("wall.block", this.WALL_BLOCK, "Top wall block",
Configuration.BLOCK_BUCKET),
ConfigurationUtil.BLOCK_BUCKET),
new ConfigurationNode("wall.block_claimed", this.CLAIMED_WALL_BLOCK,
"Wall block (claimed)", Configuration.BLOCK_BUCKET),
"Wall block (claimed)", ConfigurationUtil.BLOCK_BUCKET),
new ConfigurationNode("road.width", this.ROAD_WIDTH, "Road width",
Configuration.INTEGER),
ConfigurationUtil.INTEGER),
new ConfigurationNode("road.height", this.ROAD_HEIGHT, "Road height",
Configuration.INTEGER),
ConfigurationUtil.INTEGER),
new ConfigurationNode("road.block", this.ROAD_BLOCK, "Road block",
Configuration.BLOCK_BUCKET),
ConfigurationUtil.BLOCK_BUCKET),
new ConfigurationNode("wall.filling", this.WALL_FILLING, "Wall filling block",
Configuration.BLOCK_BUCKET),
ConfigurationUtil.BLOCK_BUCKET),
new ConfigurationNode("wall.height", this.WALL_HEIGHT, "Wall height",
Configuration.INTEGER),
ConfigurationUtil.INTEGER),
new ConfigurationNode("plot.bedrock", this.PLOT_BEDROCK, "Plot bedrock generation",
Configuration.BOOLEAN)};
ConfigurationUtil.BOOLEAN)};
}
/**

2
Core/src/main/java/com/plotsquared/core/generator/HybridGen.java
View file

@ -26,7 +26,7 @@
package com.plotsquared.core.generator;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.config.Settings;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.plot.PlotId;

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