feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Move all classes to the logblock package

Browse Source
This commit is contained in:
Brokkonaut
2021-08-27 02:25:11 +02:00
parent c940dfc05a
commit e430ee073f
48 changed files with 127 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/de/diddiz/LogBlock/Actor.java
View File

@ -7,9 +7,10 @@ import org.bukkit.entity.Projectile;
import org.bukkit.projectiles.BlockProjectileSource;
import org.bukkit.projectiles.ProjectileSource;
import static de.diddiz.LogBlock.util.BukkitUtils.entityName;
import java.sql.ResultSet;
import java.sql.SQLException;
import static de.diddiz.util.BukkitUtils.entityName;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.Block;

22
src/main/java/de/diddiz/LogBlock/BlockChange.java
View File

@ -1,18 +1,18 @@
package de.diddiz.LogBlock;
import static de.diddiz.util.ActionColor.CREATE;
import static de.diddiz.util.ActionColor.DESTROY;
import static de.diddiz.util.ActionColor.INTERACT;
import static de.diddiz.util.TypeColor.DEFAULT;
import static de.diddiz.util.MessagingUtil.createTextComponentWithColor;
import static de.diddiz.util.MessagingUtil.prettyDate;
import static de.diddiz.util.MessagingUtil.prettyLocation;
import static de.diddiz.util.MessagingUtil.prettyMaterial;
import static de.diddiz.util.MessagingUtil.prettyState;
import static de.diddiz.LogBlock.util.ActionColor.CREATE;
import static de.diddiz.LogBlock.util.ActionColor.DESTROY;
import static de.diddiz.LogBlock.util.ActionColor.INTERACT;
import static de.diddiz.LogBlock.util.MessagingUtil.createTextComponentWithColor;
import static de.diddiz.LogBlock.util.MessagingUtil.prettyDate;
import static de.diddiz.LogBlock.util.MessagingUtil.prettyLocation;
import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial;
import static de.diddiz.LogBlock.util.MessagingUtil.prettyState;
import static de.diddiz.LogBlock.util.TypeColor.DEFAULT;
import de.diddiz.LogBlock.blockstate.BlockStateCodecs;
import de.diddiz.util.BukkitUtils;
import de.diddiz.util.Utils;
import de.diddiz.LogBlock.util.BukkitUtils;
import de.diddiz.LogBlock.util.Utils;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.logging.Level;

10
src/main/java/de/diddiz/LogBlock/ChatMessage.java
View File

@ -1,11 +1,11 @@
package de.diddiz.LogBlock;
import static de.diddiz.util.LoggingUtil.checkText;
import static de.diddiz.util.MessagingUtil.brackets;
import static de.diddiz.util.MessagingUtil.prettyDate;
import static de.diddiz.LogBlock.util.LoggingUtil.checkText;
import static de.diddiz.LogBlock.util.MessagingUtil.brackets;
import static de.diddiz.LogBlock.util.MessagingUtil.prettyDate;
import de.diddiz.util.MessagingUtil;
import de.diddiz.util.MessagingUtil.BracketType;
import de.diddiz.LogBlock.util.MessagingUtil;
import de.diddiz.LogBlock.util.MessagingUtil.BracketType;
import java.sql.ResultSet;
import java.sql.SQLException;
import net.md_5.bungee.api.chat.BaseComponent;

18
src/main/java/de/diddiz/LogBlock/CommandsHandler.java
View File

@ -14,21 +14,21 @@ import static de.diddiz.LogBlock.config.Config.rollbackMaxArea;
import static de.diddiz.LogBlock.config.Config.rollbackMaxTime;
import static de.diddiz.LogBlock.config.Config.toolsByName;
import static de.diddiz.LogBlock.config.Config.toolsByType;
import static de.diddiz.util.BukkitUtils.giveTool;
import static de.diddiz.util.BukkitUtils.saveSpawnHeight;
import static de.diddiz.util.TypeColor.DEFAULT;
import static de.diddiz.util.TypeColor.ERROR;
import static de.diddiz.util.TypeColor.HEADER;
import static de.diddiz.util.Utils.isInt;
import static de.diddiz.util.Utils.listing;
import static de.diddiz.LogBlock.util.BukkitUtils.giveTool;
import static de.diddiz.LogBlock.util.BukkitUtils.saveSpawnHeight;
import static de.diddiz.LogBlock.util.TypeColor.DEFAULT;
import static de.diddiz.LogBlock.util.TypeColor.ERROR;
import static de.diddiz.LogBlock.util.TypeColor.HEADER;
import static de.diddiz.LogBlock.util.Utils.isInt;
import static de.diddiz.LogBlock.util.Utils.listing;
import de.diddiz.LogBlock.QueryParams.BlockChangeType;
import de.diddiz.LogBlock.QueryParams.Order;
import de.diddiz.LogBlock.QueryParams.SummarizationMode;
import de.diddiz.LogBlock.config.Config;
import de.diddiz.LogBlock.config.WorldConfig;
import de.diddiz.util.MessagingUtil;
import de.diddiz.util.Utils;
import de.diddiz.LogBlock.util.MessagingUtil;
import de.diddiz.LogBlock.util.Utils;
import java.io.BufferedOutputStream;
import java.io.BufferedWriter;
import java.io.File;

10
src/main/java/de/diddiz/LogBlock/Consumer.java
View File

@ -5,9 +5,9 @@ import static de.diddiz.LogBlock.config.Config.hiddenBlocks;
import static de.diddiz.LogBlock.config.Config.hiddenPlayers;
import static de.diddiz.LogBlock.config.Config.isLogged;
import static de.diddiz.LogBlock.config.Config.logPlayerInfo;
import static de.diddiz.util.BukkitUtils.compressInventory;
import static de.diddiz.util.BukkitUtils.itemIDfromProjectileEntity;
import static de.diddiz.util.Utils.mysqlTextEscape;
import static de.diddiz.LogBlock.util.BukkitUtils.compressInventory;
import static de.diddiz.LogBlock.util.BukkitUtils.itemIDfromProjectileEntity;
import static de.diddiz.LogBlock.util.Utils.mysqlTextEscape;
import java.io.File;
import java.io.FileNotFoundException;
@ -54,8 +54,8 @@ import de.diddiz.LogBlock.blockstate.BlockStateCodecs;
import de.diddiz.LogBlock.config.Config;
import de.diddiz.LogBlock.events.BlockChangePreLogEvent;
import de.diddiz.LogBlock.events.EntityChangePreLogEvent;
import de.diddiz.util.BukkitUtils;
import de.diddiz.util.Utils;
import de.diddiz.LogBlock.util.BukkitUtils;
import de.diddiz.LogBlock.util.Utils;
public class Consumer extends Thread {
private static final int MAX_SHUTDOWN_TIME_MILLIS = 20000;

5
src/main/java/de/diddiz/LogBlock/DumpedLogImporter.java
View File

@ -1,7 +1,8 @@
package de.diddiz.LogBlock;
import de.diddiz.util.Utils.ExtensionFilenameFilter;
import static de.diddiz.LogBlock.util.Utils.newline;
import de.diddiz.LogBlock.util.Utils.ExtensionFilenameFilter;
import java.io.*;
import java.sql.Connection;
import java.sql.SQLException;
@ -11,8 +12,6 @@ import java.util.Comparator;
import java.util.logging.Level;
import java.util.regex.Pattern;
import static de.diddiz.util.Utils.newline;
public class DumpedLogImporter implements Runnable {
private final LogBlock logblock;

18
src/main/java/de/diddiz/LogBlock/EntityChange.java
View File

@ -1,15 +1,15 @@
package de.diddiz.LogBlock;
import static de.diddiz.util.ActionColor.CREATE;
import static de.diddiz.util.ActionColor.DESTROY;
import static de.diddiz.util.ActionColor.INTERACT;
import static de.diddiz.util.MessagingUtil.createTextComponentWithColor;
import static de.diddiz.util.MessagingUtil.prettyDate;
import static de.diddiz.util.MessagingUtil.prettyEntityType;
import static de.diddiz.util.MessagingUtil.prettyLocation;
import static de.diddiz.util.MessagingUtil.prettyMaterial;
import static de.diddiz.LogBlock.util.ActionColor.CREATE;
import static de.diddiz.LogBlock.util.ActionColor.DESTROY;
import static de.diddiz.LogBlock.util.ActionColor.INTERACT;
import static de.diddiz.LogBlock.util.MessagingUtil.createTextComponentWithColor;
import static de.diddiz.LogBlock.util.MessagingUtil.prettyDate;
import static de.diddiz.LogBlock.util.MessagingUtil.prettyEntityType;
import static de.diddiz.LogBlock.util.MessagingUtil.prettyLocation;
import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial;
import de.diddiz.util.Utils;
import de.diddiz.LogBlock.util.Utils;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.UUID;

13
src/main/java/de/diddiz/LogBlock/Kill.java
View File

@ -1,11 +1,12 @@
package de.diddiz.LogBlock;
import static de.diddiz.util.ActionColor.DESTROY;
import static de.diddiz.util.MessagingUtil.prettyDate;
import static de.diddiz.util.MessagingUtil.prettyLocation;
import static de.diddiz.util.MessagingUtil.prettyMaterial;
import de.diddiz.util.BukkitUtils;
import de.diddiz.util.MessagingUtil;
import static de.diddiz.LogBlock.util.ActionColor.DESTROY;
import static de.diddiz.LogBlock.util.MessagingUtil.prettyDate;
import static de.diddiz.LogBlock.util.MessagingUtil.prettyLocation;
import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial;
import de.diddiz.LogBlock.util.BukkitUtils;
import de.diddiz.LogBlock.util.MessagingUtil;
import java.sql.ResultSet;
import java.sql.SQLException;
import net.md_5.bungee.api.chat.BaseComponent;

8
src/main/java/de/diddiz/LogBlock/LogBlock.java
View File

@ -3,10 +3,10 @@ package de.diddiz.LogBlock;
import de.diddiz.LogBlock.config.Config;
import de.diddiz.LogBlock.listeners.*;
import de.diddiz.LogBlock.questioner.Questioner;
import de.diddiz.util.BukkitUtils;
import de.diddiz.util.MySQLConnectionPool;
import de.diddiz.worldedit.WorldEditHelper;
import de.diddiz.worldedit.WorldEditLoggingHook;
import de.diddiz.LogBlock.util.BukkitUtils;
import de.diddiz.LogBlock.util.MySQLConnectionPool;
import de.diddiz.LogBlock.worldedit.WorldEditHelper;
import de.diddiz.LogBlock.worldedit.WorldEditLoggingHook;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.command.Command;

14
src/main/java/de/diddiz/LogBlock/QueryParams.java
View File

@ -1,11 +1,11 @@
package de.diddiz.LogBlock;
import de.diddiz.LogBlock.config.Config;
import de.diddiz.util.BukkitUtils;
import de.diddiz.util.CuboidRegion;
import de.diddiz.util.SqlUtil;
import de.diddiz.util.Utils;
import de.diddiz.worldedit.WorldEditHelper;
import de.diddiz.LogBlock.util.BukkitUtils;
import de.diddiz.LogBlock.util.CuboidRegion;
import de.diddiz.LogBlock.util.SqlUtil;
import de.diddiz.LogBlock.util.Utils;
import de.diddiz.LogBlock.worldedit.WorldEditHelper;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
@ -20,8 +20,8 @@ import java.util.regex.Pattern;
import static de.diddiz.LogBlock.Session.getSession;
import static de.diddiz.LogBlock.config.Config.*;
import static de.diddiz.util.BukkitUtils.friendlyWorldname;
import static de.diddiz.util.Utils.*;
import static de.diddiz.LogBlock.util.BukkitUtils.friendlyWorldname;
import static de.diddiz.LogBlock.util.Utils.*;
public final class QueryParams implements Cloneable {
private static final HashMap<String, Integer> keywords = new HashMap<>();

5
src/main/java/de/diddiz/LogBlock/SummedBlockChanges.java
View File

@ -1,8 +1,9 @@
package de.diddiz.LogBlock;
import static de.diddiz.util.MessagingUtil.prettyMaterial;
import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial;
import de.diddiz.LogBlock.QueryParams.SummarizationMode;
import de.diddiz.util.MessagingUtil;
import de.diddiz.LogBlock.util.MessagingUtil;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Objects;

6
src/main/java/de/diddiz/LogBlock/SummedEntityChanges.java
View File

@ -1,7 +1,9 @@
package de.diddiz.LogBlock;
import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial;
import de.diddiz.LogBlock.QueryParams.SummarizationMode;
import de.diddiz.util.MessagingUtil;
import de.diddiz.LogBlock.util.MessagingUtil;
import org.bukkit.Location;
import java.sql.ResultSet;
@ -10,8 +12,6 @@ import java.util.Objects;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TextComponent;
import static de.diddiz.util.MessagingUtil.prettyMaterial;
public class SummedEntityChanges implements LookupCacheElement {
private final int type;
private final int created, destroyed;

2
src/main/java/de/diddiz/LogBlock/SummedKills.java
View File

@ -1,6 +1,6 @@
package de.diddiz.LogBlock;
import de.diddiz.util.MessagingUtil;
import de.diddiz.LogBlock.util.MessagingUtil;
import java.sql.ResultSet;
import java.sql.SQLException;
import net.md_5.bungee.api.chat.BaseComponent;

9
src/main/java/de/diddiz/LogBlock/Updater.java
View File

@ -3,9 +3,9 @@ package de.diddiz.LogBlock;
import de.diddiz.LogBlock.blockstate.BlockStateCodecSign;
import de.diddiz.LogBlock.config.Config;
import de.diddiz.LogBlock.config.WorldConfig;
import de.diddiz.util.UUIDFetcher;
import de.diddiz.util.Utils;
import de.diddiz.LogBlock.util.ComparableVersion;
import de.diddiz.LogBlock.util.UUIDFetcher;
import de.diddiz.LogBlock.util.Utils;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.block.data.BlockData;
@ -25,8 +25,7 @@ import java.util.logging.Level;
import static de.diddiz.LogBlock.config.Config.getLoggedWorlds;
import static de.diddiz.LogBlock.config.Config.isLogging;
import static de.diddiz.util.BukkitUtils.friendlyWorldname;
import de.diddiz.util.ComparableVersion;
import static de.diddiz.LogBlock.util.BukkitUtils.friendlyWorldname;
class Updater {
private final LogBlock logblock;

9
src/main/java/de/diddiz/LogBlock/WorldEditor.java
View File

@ -28,10 +28,9 @@ import org.bukkit.inventory.ItemStack;
import de.diddiz.LogBlock.QueryParams.Order;
import de.diddiz.LogBlock.blockstate.BlockStateCodecs;
import de.diddiz.util.BukkitUtils;
import de.diddiz.util.Utils;
import de.diddiz.worldedit.WorldEditHelper;
import de.diddiz.LogBlock.util.BukkitUtils;
import de.diddiz.LogBlock.util.Utils;
import de.diddiz.LogBlock.worldedit.WorldEditHelper;
import java.io.File;
import java.io.PrintWriter;
import java.sql.ResultSet;
@ -49,7 +48,7 @@ import net.md_5.bungee.api.chat.TextComponent;
import static de.diddiz.LogBlock.config.Config.dontRollback;
import static de.diddiz.LogBlock.config.Config.replaceAnyway;
import static de.diddiz.util.BukkitUtils.*;
import static de.diddiz.LogBlock.util.BukkitUtils.*;
public class WorldEditor implements Runnable {
private final LogBlock logblock;

2
src/main/java/de/diddiz/LogBlock/WorldEditorEditFactory.java
View File

@ -6,7 +6,7 @@ import java.sql.SQLException;
import org.bukkit.inventory.ItemStack;
import de.diddiz.LogBlock.QueryParams.BlockChangeType;
import de.diddiz.util.Utils;
import de.diddiz.LogBlock.util.Utils;
public class WorldEditorEditFactory {
private final WorldEditor editor;

2
src/main/java/de/diddiz/LogBlock/blockstate/BlockStateCodecShulkerBox.java
View File

@ -4,7 +4,7 @@ import static de.diddiz.LogBlock.config.Config.getWorldConfig;
import de.diddiz.LogBlock.Logging;
import de.diddiz.LogBlock.config.WorldConfig;
import de.diddiz.util.BukkitUtils;
import de.diddiz.LogBlock.util.BukkitUtils;
import org.bukkit.Material;
import org.bukkit.block.BlockState;
import org.bukkit.block.ShulkerBox;

2
src/main/java/de/diddiz/LogBlock/blockstate/BlockStateCodecSign.java
View File

@ -1,6 +1,6 @@
package de.diddiz.LogBlock.blockstate;
import de.diddiz.util.BukkitUtils;
import de.diddiz.LogBlock.util.BukkitUtils;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

7
src/main/java/de/diddiz/LogBlock/config/Config.java
View File

@ -1,8 +1,7 @@
package de.diddiz.LogBlock.config;
import de.diddiz.LogBlock.*;
import de.diddiz.util.ComparableVersion;
import de.diddiz.LogBlock.util.ComparableVersion;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.configuration.ConfigurationSection;
@ -17,8 +16,8 @@ import java.util.Map.Entry;
import java.util.logging.Level;
import java.util.zip.DataFormatException;
import static de.diddiz.util.BukkitUtils.friendlyWorldname;
import static de.diddiz.util.Utils.parseTimeSpec;
import static de.diddiz.LogBlock.util.BukkitUtils.friendlyWorldname;
import static de.diddiz.LogBlock.util.Utils.parseTimeSpec;
import static org.bukkit.Bukkit.*;
public class Config {

3
src/main/java/de/diddiz/LogBlock/config/WorldConfig.java
View File

@ -2,8 +2,7 @@ package de.diddiz.LogBlock.config;
import de.diddiz.LogBlock.LogBlock;
import de.diddiz.LogBlock.Logging;
import de.diddiz.util.BukkitUtils;
import de.diddiz.LogBlock.util.BukkitUtils;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Animals;
import org.bukkit.entity.ArmorStand;

4
src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java
View File

@ -42,8 +42,8 @@ import de.diddiz.LogBlock.EntityChange.EntityChangeType;
import de.diddiz.LogBlock.LogBlock;
import de.diddiz.LogBlock.config.Config;
import de.diddiz.LogBlock.config.EntityLogging;
import de.diddiz.util.LoggingUtil;
import de.diddiz.worldedit.WorldEditHelper;
import de.diddiz.LogBlock.util.LoggingUtil;
import de.diddiz.LogBlock.worldedit.WorldEditHelper;
import java.util.UUID;
public class AdvancedEntityLogging extends LoggingListener {

9
src/main/java/de/diddiz/LogBlock/listeners/BlockBreakLogging.java
View File

@ -4,8 +4,7 @@ import de.diddiz.LogBlock.Actor;
import de.diddiz.LogBlock.LogBlock;
import de.diddiz.LogBlock.Logging;
import de.diddiz.LogBlock.config.WorldConfig;
import de.diddiz.util.BukkitUtils;
import de.diddiz.LogBlock.util.BukkitUtils;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Material;
@ -19,9 +18,9 @@ import org.bukkit.event.player.PlayerBucketFillEvent;
import static de.diddiz.LogBlock.config.Config.getWorldConfig;
import static de.diddiz.LogBlock.config.Config.isLogging;
import static de.diddiz.util.LoggingUtil.smartLogBlockBreak;
import static de.diddiz.util.LoggingUtil.smartLogBlockReplace;
import static de.diddiz.util.LoggingUtil.smartLogFallables;
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockBreak;
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockReplace;
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogFallables;
public class BlockBreakLogging extends LoggingListener {
public BlockBreakLogging(LogBlock lb) {

6
src/main/java/de/diddiz/LogBlock/listeners/BlockBurnLogging.java
View File

@ -17,9 +17,9 @@ import org.bukkit.event.block.BlockIgniteEvent.IgniteCause;
import org.bukkit.event.player.PlayerInteractEvent;
import static de.diddiz.LogBlock.config.Config.isLogging;
import static de.diddiz.util.LoggingUtil.smartLogBlockBreak;
import static de.diddiz.util.LoggingUtil.smartLogBlockReplace;
import static de.diddiz.util.LoggingUtil.smartLogFallables;
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockBreak;
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockReplace;
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogFallables;
public class BlockBurnLogging extends LoggingListener {
public BlockBurnLogging(LogBlock lb) {

3
src/main/java/de/diddiz/LogBlock/listeners/BlockPlaceLogging.java
View File

@ -4,8 +4,7 @@ import de.diddiz.LogBlock.Actor;
import de.diddiz.LogBlock.LogBlock;
import de.diddiz.LogBlock.Logging;
import de.diddiz.LogBlock.config.Config;
import de.diddiz.util.LoggingUtil;
import de.diddiz.LogBlock.util.LoggingUtil;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockState;

2
src/main/java/de/diddiz/LogBlock/listeners/ChestAccessLogging.java
View File

@ -24,7 +24,7 @@ import java.util.Map;
import java.util.Map.Entry;
import static de.diddiz.LogBlock.config.Config.isLogging;
import static de.diddiz.util.BukkitUtils.*;
import static de.diddiz.LogBlock.util.BukkitUtils.*;
public class ChestAccessLogging extends LoggingListener {
private class PlayerActiveInventoryModifications {

2
src/main/java/de/diddiz/LogBlock/listeners/CreatureInteractLogging.java
View File

@ -4,7 +4,7 @@ import de.diddiz.LogBlock.Actor;
import de.diddiz.LogBlock.LogBlock;
import de.diddiz.LogBlock.Logging;
import de.diddiz.LogBlock.config.WorldConfig;
import de.diddiz.util.BukkitUtils;
import de.diddiz.LogBlock.util.BukkitUtils;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;

2
src/main/java/de/diddiz/LogBlock/listeners/DragonEggLogging.java
View File

@ -20,7 +20,7 @@ import de.diddiz.LogBlock.Actor;
import de.diddiz.LogBlock.LogBlock;
import de.diddiz.LogBlock.Logging;
import de.diddiz.LogBlock.config.Config;
import de.diddiz.util.LoggingUtil;
import de.diddiz.LogBlock.util.LoggingUtil;
public class DragonEggLogging extends LoggingListener {

5
src/main/java/de/diddiz/LogBlock/listeners/ExplosionLogging.java
View File

@ -5,8 +5,7 @@ import de.diddiz.LogBlock.LogBlock;
import de.diddiz.LogBlock.Logging;
import de.diddiz.LogBlock.config.Config;
import de.diddiz.LogBlock.config.WorldConfig;
import de.diddiz.util.BukkitUtils;
import de.diddiz.LogBlock.util.BukkitUtils;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
@ -24,7 +23,7 @@ import org.bukkit.scheduler.BukkitRunnable;
import static de.diddiz.LogBlock.config.Config.getWorldConfig;
import static de.diddiz.LogBlock.config.Config.logCreeperExplosionsAsPlayerWhoTriggeredThese;
import static de.diddiz.util.BukkitUtils.getContainerBlocks;
import static de.diddiz.LogBlock.util.BukkitUtils.getContainerBlocks;
import java.util.UUID;

3
src/main/java/de/diddiz/LogBlock/listeners/FluidFlowLogging.java
View File

@ -5,8 +5,7 @@ import de.diddiz.LogBlock.LogBlock;
import de.diddiz.LogBlock.Logging;
import de.diddiz.LogBlock.config.Config;
import de.diddiz.LogBlock.config.WorldConfig;
import de.diddiz.util.BukkitUtils;
import de.diddiz.LogBlock.util.BukkitUtils;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;

2
src/main/java/de/diddiz/LogBlock/listeners/InteractLogging.java
View File

@ -4,7 +4,7 @@ import de.diddiz.LogBlock.Actor;
import de.diddiz.LogBlock.LogBlock;
import de.diddiz.LogBlock.Logging;
import de.diddiz.LogBlock.config.WorldConfig;
import de.diddiz.util.BukkitUtils;
import de.diddiz.LogBlock.util.BukkitUtils;
import org.bukkit.DyeColor;
import org.bukkit.Location;
import org.bukkit.Material;

4
src/main/java/de/diddiz/LogBlock/listeners/LeavesDecayLogging.java
View File

@ -8,8 +8,8 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.block.LeavesDecayEvent;
import static de.diddiz.LogBlock.config.Config.isLogging;
import static de.diddiz.util.LoggingUtil.smartLogBlockBreak;
import static de.diddiz.util.LoggingUtil.smartLogFallables;
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockBreak;
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogFallables;
public class LeavesDecayLogging extends LoggingListener {
public LeavesDecayLogging(LogBlock lb) {

2
src/main/java/de/diddiz/LogBlock/listeners/ScaffoldingLogging.java
View File

@ -18,7 +18,7 @@ import org.bukkit.event.block.BlockFadeEvent;
import org.bukkit.event.block.BlockPlaceEvent;
import static de.diddiz.LogBlock.config.Config.isLogging;
import static de.diddiz.util.LoggingUtil.smartLogFallables;
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogFallables;
public class ScaffoldingLogging extends LoggingListener {
private final static long MAX_SCAFFOLDING_LOG_TIME_MS = 2000;

4
src/main/java/de/diddiz/LogBlock/listeners/ToolListener.java
View File

@ -2,8 +2,8 @@ package de.diddiz.LogBlock.listeners;
import de.diddiz.LogBlock.*;
import de.diddiz.LogBlock.events.ToolUseEvent;
import de.diddiz.util.BukkitUtils;
import de.diddiz.util.CuboidRegion;
import de.diddiz.LogBlock.util.BukkitUtils;
import de.diddiz.LogBlock.util.CuboidRegion;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.block.Block;

2
src/main/java/de/diddiz/util/ActionColor.java → src/main/java/de/diddiz/LogBlock/util/ActionColor.java
View File

@ -1,4 +1,4 @@
package de.diddiz.util;
package de.diddiz.LogBlock.util;
import net.md_5.bungee.api.ChatColor;

4
src/main/java/de/diddiz/util/BukkitUtils.java → src/main/java/de/diddiz/LogBlock/util/BukkitUtils.java
View File

@ -1,6 +1,6 @@
package de.diddiz.util;
package de.diddiz.LogBlock.util;
import static de.diddiz.util.MessagingUtil.prettyMaterial;
import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial;
import de.diddiz.LogBlock.LogBlock;
import java.io.File;

2
src/main/java/de/diddiz/util/ComparableVersion.java → src/main/java/de/diddiz/LogBlock/util/ComparableVersion.java
View File

@ -1,4 +1,4 @@
package de.diddiz.util;
package de.diddiz.LogBlock.util;
// Taken from maven-artifact at
// http://grepcode.com/file_/repo1.maven.org/maven2/org.apache.maven/maven-artifact/3.2.3/org/apache/maven/artifact/versioning/ComparableVersion.java/?v=source

2
src/main/java/de/diddiz/util/CuboidRegion.java → src/main/java/de/diddiz/LogBlock/util/CuboidRegion.java
View File

@ -1,4 +1,4 @@
package de.diddiz.util;
package de.diddiz.LogBlock.util;
import org.bukkit.Location;
import org.bukkit.World;

2
src/main/java/de/diddiz/util/LoggingUtil.java → src/main/java/de/diddiz/LogBlock/util/LoggingUtil.java
View File

@ -1,4 +1,4 @@
package de.diddiz.util;
package de.diddiz.LogBlock.util;
import de.diddiz.LogBlock.Actor;
import de.diddiz.LogBlock.Consumer;

10
src/main/java/de/diddiz/util/MessagingUtil.java → src/main/java/de/diddiz/LogBlock/util/MessagingUtil.java
View File

@ -1,9 +1,9 @@
package de.diddiz.util;
package de.diddiz.LogBlock.util;
import static de.diddiz.util.ActionColor.CREATE;
import static de.diddiz.util.ActionColor.DESTROY;
import static de.diddiz.util.TypeColor.DEFAULT;
import static de.diddiz.util.Utils.spaces;
import static de.diddiz.LogBlock.util.ActionColor.CREATE;
import static de.diddiz.LogBlock.util.ActionColor.DESTROY;
import static de.diddiz.LogBlock.util.TypeColor.DEFAULT;
import static de.diddiz.LogBlock.util.Utils.spaces;
import de.diddiz.LogBlock.config.Config;
import net.md_5.bungee.api.ChatColor;

2
src/main/java/de/diddiz/util/MySQLConnectionPool.java → src/main/java/de/diddiz/LogBlock/util/MySQLConnectionPool.java
View File

@ -1,4 +1,4 @@
package de.diddiz.util;
package de.diddiz.LogBlock.util;
import com.zaxxer.hikari.HikariDataSource;
import de.diddiz.LogBlock.config.Config;

2
src/main/java/de/diddiz/util/ReflectionUtil.java → src/main/java/de/diddiz/LogBlock/util/ReflectionUtil.java
View File

@ -1,4 +1,4 @@
package de.diddiz.util;
package de.diddiz.LogBlock.util;
import org.bukkit.Bukkit;

2
src/main/java/de/diddiz/util/SqlUtil.java → src/main/java/de/diddiz/LogBlock/util/SqlUtil.java
View File

@ -1,4 +1,4 @@
package de.diddiz.util;
package de.diddiz.LogBlock.util;
public class SqlUtil {
public static String escapeString(String s) {

2
src/main/java/de/diddiz/util/TypeColor.java → src/main/java/de/diddiz/LogBlock/util/TypeColor.java
View File

@ -1,4 +1,4 @@
package de.diddiz.util;
package de.diddiz.LogBlock.util;
import net.md_5.bungee.api.ChatColor;

2
src/main/java/de/diddiz/util/UUIDFetcher.java → src/main/java/de/diddiz/LogBlock/util/UUIDFetcher.java
View File

@ -1,4 +1,4 @@
package de.diddiz.util;
package de.diddiz.LogBlock.util;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;

2
src/main/java/de/diddiz/util/Utils.java → src/main/java/de/diddiz/LogBlock/util/Utils.java
View File

@ -1,4 +1,4 @@
package de.diddiz.util;
package de.diddiz.LogBlock.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;

4
src/main/java/de/diddiz/worldedit/WorldEditHelper.java → src/main/java/de/diddiz/LogBlock/worldedit/WorldEditHelper.java
View File

@ -1,4 +1,4 @@
package de.diddiz.worldedit;
package de.diddiz.LogBlock.worldedit;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@ -34,7 +34,7 @@ import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.Region;
import de.diddiz.LogBlock.LogBlock;
import de.diddiz.util.CuboidRegion;
import de.diddiz.LogBlock.util.CuboidRegion;
public class WorldEditHelper {
private static boolean checkedForWorldEdit;

5
src/main/java/de/diddiz/worldedit/WorldEditLoggingHook.java → src/main/java/de/diddiz/LogBlock/worldedit/WorldEditLoggingHook.java
View File

@ -1,4 +1,4 @@
package de.diddiz.worldedit;
package de.diddiz.LogBlock.worldedit;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.WorldEdit;
@ -15,8 +15,7 @@ import de.diddiz.LogBlock.LogBlock;
import de.diddiz.LogBlock.Logging;
import de.diddiz.LogBlock.blockstate.BlockStateCodecs;
import de.diddiz.LogBlock.config.Config;
import de.diddiz.util.BukkitUtils;
import de.diddiz.LogBlock.util.BukkitUtils;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;

3
src/test/java/de/diddiz/LogBlock/QueryParsingTest.java
View File

@ -1,9 +1,8 @@
package de.diddiz.LogBlock;
import de.diddiz.util.Utils;
import org.junit.Assert;
import org.junit.Test;
import de.diddiz.LogBlock.util.Utils;
import java.util.Arrays;
import java.util.List;