forked from LogBlock/LogBlock
Fix line endings
This commit is contained in:
@ -1,182 +1,182 @@
|
|||||||
package de.diddiz.LogBlock;
|
package de.diddiz.LogBlock;
|
||||||
|
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
import org.bukkit.entity.EntityType;
|
import org.bukkit.entity.EntityType;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.entity.Projectile;
|
import org.bukkit.entity.Projectile;
|
||||||
import org.bukkit.projectiles.BlockProjectileSource;
|
import org.bukkit.projectiles.BlockProjectileSource;
|
||||||
import org.bukkit.projectiles.ProjectileSource;
|
import org.bukkit.projectiles.ProjectileSource;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.util.BukkitUtils.entityName;
|
import static de.diddiz.LogBlock.util.BukkitUtils.entityName;
|
||||||
|
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
|
|
||||||
public class Actor {
|
public class Actor {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int hashCode() {
|
public int hashCode() {
|
||||||
return this.UUID != null ? this.UUID.hashCode() : 0;
|
return this.UUID != null ? this.UUID.hashCode() : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean equals(Object obj) {
|
public boolean equals(Object obj) {
|
||||||
if (obj == null || getClass() != obj.getClass()) {
|
if (obj == null || getClass() != obj.getClass()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
final Actor other = (Actor) obj;
|
final Actor other = (Actor) obj;
|
||||||
return (this.UUID == null) ? (other.UUID == null) : this.UUID.equals(other.UUID);
|
return (this.UUID == null) ? (other.UUID == null) : this.UUID.equals(other.UUID);
|
||||||
}
|
}
|
||||||
|
|
||||||
final String name;
|
final String name;
|
||||||
final String UUID;
|
final String UUID;
|
||||||
final Location blockLocation;
|
final Location blockLocation;
|
||||||
final Entity entity;
|
final Entity entity;
|
||||||
|
|
||||||
public Actor(String name, String UUID) {
|
public Actor(String name, String UUID) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.UUID = UUID == null ? "unknown" : (UUID.length() > 36 ? UUID.substring(0, 36) : UUID);
|
this.UUID = UUID == null ? "unknown" : (UUID.length() > 36 ? UUID.substring(0, 36) : UUID);
|
||||||
this.blockLocation = null;
|
this.blockLocation = null;
|
||||||
this.entity = null;
|
this.entity = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Actor(String name, String UUID, Block block) {
|
public Actor(String name, String UUID, Block block) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.UUID = UUID == null ? "unknown" : (UUID.length() > 36 ? UUID.substring(0, 36) : UUID);
|
this.UUID = UUID == null ? "unknown" : (UUID.length() > 36 ? UUID.substring(0, 36) : UUID);
|
||||||
this.blockLocation = block == null ? null : block.getLocation();
|
this.blockLocation = block == null ? null : block.getLocation();
|
||||||
this.entity = null;
|
this.entity = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Actor(String name, java.util.UUID UUID) {
|
public Actor(String name, java.util.UUID UUID) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.UUID = UUID.toString();
|
this.UUID = UUID.toString();
|
||||||
this.blockLocation = null;
|
this.blockLocation = null;
|
||||||
this.entity = null;
|
this.entity = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Actor(String name, java.util.UUID UUID, Block block) {
|
public Actor(String name, java.util.UUID UUID, Block block) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.UUID = UUID.toString();
|
this.UUID = UUID.toString();
|
||||||
this.blockLocation = block == null ? null : block.getLocation();
|
this.blockLocation = block == null ? null : block.getLocation();
|
||||||
this.entity = null;
|
this.entity = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Actor(String name, java.util.UUID UUID, Entity entity) {
|
public Actor(String name, java.util.UUID UUID, Entity entity) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.UUID = UUID.toString();
|
this.UUID = UUID.toString();
|
||||||
this.blockLocation = null;
|
this.blockLocation = null;
|
||||||
this.entity = entity;
|
this.entity = entity;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Actor(String name) {
|
public Actor(String name) {
|
||||||
this(name, generateUUID(name));
|
this(name, generateUUID(name));
|
||||||
}
|
}
|
||||||
|
|
||||||
public Actor(String name, Block block) {
|
public Actor(String name, Block block) {
|
||||||
this(name, generateUUID(name), block);
|
this(name, generateUUID(name), block);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Actor(String name, Entity entity) {
|
public Actor(String name, Entity entity) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.UUID = generateUUID(name);
|
this.UUID = generateUUID(name);
|
||||||
this.blockLocation = null;
|
this.blockLocation = null;
|
||||||
this.entity = entity;
|
this.entity = entity;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Actor(ResultSet rs) throws SQLException {
|
public Actor(ResultSet rs) throws SQLException {
|
||||||
this(rs.getString("playername"), rs.getString("UUID"));
|
this(rs.getString("playername"), rs.getString("UUID"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getUUID() {
|
public String getUUID() {
|
||||||
return UUID;
|
return UUID;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Location getBlockLocation() {
|
public Location getBlockLocation() {
|
||||||
return blockLocation;
|
return blockLocation;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The acting entity object (if known)
|
* The acting entity object (if known)
|
||||||
*/
|
*/
|
||||||
public Entity getEntity() {
|
public Entity getEntity() {
|
||||||
return entity;
|
return entity;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Actor actorFromEntity(Entity entity) {
|
public static Actor actorFromEntity(Entity entity) {
|
||||||
if (entity instanceof Player) {
|
if (entity instanceof Player) {
|
||||||
return new Actor(entityName(entity), entity.getUniqueId(), entity);
|
return new Actor(entityName(entity), entity.getUniqueId(), entity);
|
||||||
}
|
}
|
||||||
if (entity instanceof Projectile) {
|
if (entity instanceof Projectile) {
|
||||||
ProjectileSource shooter = ((Projectile) entity).getShooter();
|
ProjectileSource shooter = ((Projectile) entity).getShooter();
|
||||||
if (shooter != null) {
|
if (shooter != null) {
|
||||||
return actorFromProjectileSource(shooter);
|
return actorFromProjectileSource(shooter);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return new Actor(entityName(entity), entity);
|
return new Actor(entityName(entity), entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public static Actor actorFromEntity(EntityType entity) {
|
public static Actor actorFromEntity(EntityType entity) {
|
||||||
return new Actor(entity.name());
|
return new Actor(entity.name());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Actor actorFromProjectileSource(ProjectileSource psource) {
|
public static Actor actorFromProjectileSource(ProjectileSource psource) {
|
||||||
if (psource instanceof Entity) {
|
if (psource instanceof Entity) {
|
||||||
return actorFromEntity((Entity) psource);
|
return actorFromEntity((Entity) psource);
|
||||||
}
|
}
|
||||||
if (psource instanceof BlockProjectileSource) {
|
if (psource instanceof BlockProjectileSource) {
|
||||||
return new Actor(((BlockProjectileSource) psource).getBlock().getType().toString());
|
return new Actor(((BlockProjectileSource) psource).getBlock().getType().toString());
|
||||||
} else {
|
} else {
|
||||||
return new Actor(psource.toString());
|
return new Actor(psource.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generate an Actor object from a String name, trying to guess if it's an online player
|
* Generate an Actor object from a String name, trying to guess if it's an online player
|
||||||
* and if so, setting the UUID accordingly. This only checks against currently online
|
* and if so, setting the UUID accordingly. This only checks against currently online
|
||||||
* players and is a "best effort" attempt for use with the pre-UUID API
|
* players and is a "best effort" attempt for use with the pre-UUID API
|
||||||
* <p>
|
* <p>
|
||||||
* If you know something is an entity (player or otherwise) use the {@link #actorFromEntity(org.bukkit.entity.Entity) }
|
* If you know something is an entity (player or otherwise) use the {@link #actorFromEntity(org.bukkit.entity.Entity) }
|
||||||
* or {@link #actorFromEntity(org.bukkit.entity.EntityType) } methods
|
* or {@link #actorFromEntity(org.bukkit.entity.EntityType) } methods
|
||||||
* <p>
|
* <p>
|
||||||
* If you know something is a server effect (like gravity) use {@link #Actor(java.lang.String)}
|
* If you know something is a server effect (like gravity) use {@link #Actor(java.lang.String)}
|
||||||
*
|
*
|
||||||
* @deprecated Only use this if you have a String of unknown origin
|
* @deprecated Only use this if you have a String of unknown origin
|
||||||
*
|
*
|
||||||
* @param actorName
|
* @param actorName
|
||||||
* String of unknown origin
|
* String of unknown origin
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public static Actor actorFromString(String actorName) {
|
public static Actor actorFromString(String actorName) {
|
||||||
Player p = Bukkit.getServer().getPlayerExact(actorName);
|
Player p = Bukkit.getServer().getPlayerExact(actorName);
|
||||||
if (p != null) {
|
if (p != null) {
|
||||||
return actorFromEntity(p);
|
return actorFromEntity(p);
|
||||||
}
|
}
|
||||||
// No player found online with that name, assuming non-player entity/effect
|
// No player found online with that name, assuming non-player entity/effect
|
||||||
return new Actor(actorName);
|
return new Actor(actorName);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isValidUUID(String uuid) {
|
public static boolean isValidUUID(String uuid) {
|
||||||
try {
|
try {
|
||||||
java.util.UUID.fromString(uuid);
|
java.util.UUID.fromString(uuid);
|
||||||
return true;
|
return true;
|
||||||
} catch (IllegalArgumentException e) {
|
} catch (IllegalArgumentException e) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String generateUUID(String name) {
|
public static String generateUUID(String name) {
|
||||||
return "log_" + name;
|
return "log_" + name;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,32 +1,32 @@
|
|||||||
package de.diddiz.LogBlock;
|
package de.diddiz.LogBlock;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.autoClearLog;
|
import static de.diddiz.LogBlock.config.Config.autoClearLog;
|
||||||
import static org.bukkit.Bukkit.*;
|
import static org.bukkit.Bukkit.*;
|
||||||
|
|
||||||
public class AutoClearLog implements Runnable {
|
public class AutoClearLog implements Runnable {
|
||||||
private final LogBlock logblock;
|
private final LogBlock logblock;
|
||||||
|
|
||||||
AutoClearLog(LogBlock logblock) {
|
AutoClearLog(LogBlock logblock) {
|
||||||
this.logblock = logblock;
|
this.logblock = logblock;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
final CommandsHandler handler = logblock.getCommandsHandler();
|
final CommandsHandler handler = logblock.getCommandsHandler();
|
||||||
for (final String paramStr : autoClearLog) {
|
for (final String paramStr : autoClearLog) {
|
||||||
if (!logblock.isCompletelyEnabled()) {
|
if (!logblock.isCompletelyEnabled()) {
|
||||||
return; // do not try when plugin is disabled
|
return; // do not try when plugin is disabled
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
final QueryParams params = new QueryParams(logblock, getConsoleSender(), Arrays.asList(paramStr.split(" ")));
|
final QueryParams params = new QueryParams(logblock, getConsoleSender(), Arrays.asList(paramStr.split(" ")));
|
||||||
params.noForcedLimit = true;
|
params.noForcedLimit = true;
|
||||||
handler.new CommandClearLog(getServer().getConsoleSender(), params, false);
|
handler.new CommandClearLog(getServer().getConsoleSender(), params, false);
|
||||||
} catch (final Exception ex) {
|
} catch (final Exception ex) {
|
||||||
getLogger().log(Level.SEVERE, "Failed to schedule auto ClearLog: ", ex);
|
getLogger().log(Level.SEVERE, "Failed to schedule auto ClearLog: ", ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,272 +1,272 @@
|
|||||||
package de.diddiz.LogBlock;
|
package de.diddiz.LogBlock;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.util.ActionColor.CREATE;
|
import static de.diddiz.LogBlock.util.ActionColor.CREATE;
|
||||||
import static de.diddiz.LogBlock.util.ActionColor.DESTROY;
|
import static de.diddiz.LogBlock.util.ActionColor.DESTROY;
|
||||||
import static de.diddiz.LogBlock.util.ActionColor.INTERACT;
|
import static de.diddiz.LogBlock.util.ActionColor.INTERACT;
|
||||||
import static de.diddiz.LogBlock.util.MessagingUtil.createTextComponentWithColor;
|
import static de.diddiz.LogBlock.util.MessagingUtil.createTextComponentWithColor;
|
||||||
import static de.diddiz.LogBlock.util.MessagingUtil.prettyDate;
|
import static de.diddiz.LogBlock.util.MessagingUtil.prettyDate;
|
||||||
import static de.diddiz.LogBlock.util.MessagingUtil.prettyLocation;
|
import static de.diddiz.LogBlock.util.MessagingUtil.prettyLocation;
|
||||||
import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial;
|
import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial;
|
||||||
import static de.diddiz.LogBlock.util.MessagingUtil.prettyState;
|
import static de.diddiz.LogBlock.util.MessagingUtil.prettyState;
|
||||||
import static de.diddiz.LogBlock.util.TypeColor.DEFAULT;
|
import static de.diddiz.LogBlock.util.TypeColor.DEFAULT;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.blockstate.BlockStateCodecs;
|
import de.diddiz.LogBlock.blockstate.BlockStateCodecs;
|
||||||
import de.diddiz.LogBlock.util.BukkitUtils;
|
import de.diddiz.LogBlock.util.BukkitUtils;
|
||||||
import de.diddiz.LogBlock.util.Utils;
|
import de.diddiz.LogBlock.util.Utils;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import net.md_5.bungee.api.chat.BaseComponent;
|
import net.md_5.bungee.api.chat.BaseComponent;
|
||||||
import net.md_5.bungee.api.chat.TextComponent;
|
import net.md_5.bungee.api.chat.TextComponent;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.Note;
|
import org.bukkit.Note;
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
import org.bukkit.block.data.Lightable;
|
import org.bukkit.block.data.Lightable;
|
||||||
import org.bukkit.block.data.Openable;
|
import org.bukkit.block.data.Openable;
|
||||||
import org.bukkit.block.data.Powerable;
|
import org.bukkit.block.data.Powerable;
|
||||||
import org.bukkit.block.data.Waterlogged;
|
import org.bukkit.block.data.Waterlogged;
|
||||||
import org.bukkit.block.data.type.Candle;
|
import org.bukkit.block.data.type.Candle;
|
||||||
import org.bukkit.block.data.type.Comparator;
|
import org.bukkit.block.data.type.Comparator;
|
||||||
import org.bukkit.block.data.type.DaylightDetector;
|
import org.bukkit.block.data.type.DaylightDetector;
|
||||||
import org.bukkit.block.data.type.Lectern;
|
import org.bukkit.block.data.type.Lectern;
|
||||||
import org.bukkit.block.data.type.NoteBlock;
|
import org.bukkit.block.data.type.NoteBlock;
|
||||||
import org.bukkit.block.data.type.Repeater;
|
import org.bukkit.block.data.type.Repeater;
|
||||||
import org.bukkit.block.data.type.Sign;
|
import org.bukkit.block.data.type.Sign;
|
||||||
import org.bukkit.block.data.type.Switch;
|
import org.bukkit.block.data.type.Switch;
|
||||||
import org.bukkit.block.data.type.WallSign;
|
import org.bukkit.block.data.type.WallSign;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
public class BlockChange implements LookupCacheElement {
|
public class BlockChange implements LookupCacheElement {
|
||||||
public final long id, date;
|
public final long id, date;
|
||||||
public final Location loc;
|
public final Location loc;
|
||||||
public final Actor actor;
|
public final Actor actor;
|
||||||
public final String playerName;
|
public final String playerName;
|
||||||
public final int replacedMaterial, replacedData, typeMaterial, typeData;
|
public final int replacedMaterial, replacedData, typeMaterial, typeData;
|
||||||
public final byte[] replacedState, typeState;
|
public final byte[] replacedState, typeState;
|
||||||
public final ChestAccess ca;
|
public final ChestAccess ca;
|
||||||
|
|
||||||
public BlockChange(long date, Location loc, Actor actor, int replaced, int replacedData, byte[] replacedState, int type, int typeData, byte[] typeState, ChestAccess ca) {
|
public BlockChange(long date, Location loc, Actor actor, int replaced, int replacedData, byte[] replacedState, int type, int typeData, byte[] typeState, ChestAccess ca) {
|
||||||
id = 0;
|
id = 0;
|
||||||
this.date = date;
|
this.date = date;
|
||||||
this.loc = loc;
|
this.loc = loc;
|
||||||
this.actor = actor;
|
this.actor = actor;
|
||||||
this.replacedMaterial = replaced;
|
this.replacedMaterial = replaced;
|
||||||
this.replacedData = replacedData;
|
this.replacedData = replacedData;
|
||||||
this.replacedState = replacedState;
|
this.replacedState = replacedState;
|
||||||
this.typeMaterial = type;
|
this.typeMaterial = type;
|
||||||
this.typeData = typeData;
|
this.typeData = typeData;
|
||||||
this.typeState = typeState;
|
this.typeState = typeState;
|
||||||
this.ca = ca;
|
this.ca = ca;
|
||||||
this.playerName = actor == null ? null : actor.getName();
|
this.playerName = actor == null ? null : actor.getName();
|
||||||
}
|
}
|
||||||
|
|
||||||
public BlockChange(ResultSet rs, QueryParams p) throws SQLException {
|
public BlockChange(ResultSet rs, QueryParams p) throws SQLException {
|
||||||
id = p.needId ? rs.getLong("id") : 0;
|
id = p.needId ? rs.getLong("id") : 0;
|
||||||
date = p.needDate ? rs.getTimestamp("date").getTime() : 0;
|
date = p.needDate ? rs.getTimestamp("date").getTime() : 0;
|
||||||
loc = p.needCoords ? new Location(p.world, rs.getInt("x"), rs.getInt("y"), rs.getInt("z")) : null;
|
loc = p.needCoords ? new Location(p.world, rs.getInt("x"), rs.getInt("y"), rs.getInt("z")) : null;
|
||||||
actor = p.needPlayer ? new Actor(rs) : null;
|
actor = p.needPlayer ? new Actor(rs) : null;
|
||||||
playerName = p.needPlayer ? rs.getString("playername") : null;
|
playerName = p.needPlayer ? rs.getString("playername") : null;
|
||||||
replacedMaterial = p.needType ? rs.getInt("replaced") : 0;
|
replacedMaterial = p.needType ? rs.getInt("replaced") : 0;
|
||||||
replacedData = p.needType ? rs.getInt("replacedData") : -1;
|
replacedData = p.needType ? rs.getInt("replacedData") : -1;
|
||||||
typeMaterial = p.needType ? rs.getInt("type") : 0;
|
typeMaterial = p.needType ? rs.getInt("type") : 0;
|
||||||
typeData = p.needType ? rs.getInt("typeData") : -1;
|
typeData = p.needType ? rs.getInt("typeData") : -1;
|
||||||
replacedState = p.needType ? rs.getBytes("replacedState") : null;
|
replacedState = p.needType ? rs.getBytes("replacedState") : null;
|
||||||
typeState = p.needType ? rs.getBytes("typeState") : null;
|
typeState = p.needType ? rs.getBytes("typeState") : null;
|
||||||
ChestAccess catemp = null;
|
ChestAccess catemp = null;
|
||||||
if (p.needChestAccess) {
|
if (p.needChestAccess) {
|
||||||
ItemStack stack = Utils.loadItemStack(rs.getBytes("item"));
|
ItemStack stack = Utils.loadItemStack(rs.getBytes("item"));
|
||||||
if (stack != null) {
|
if (stack != null) {
|
||||||
catemp = new ChestAccess(stack, rs.getBoolean("itemremove"), rs.getInt("itemtype"));
|
catemp = new ChestAccess(stack, rs.getBoolean("itemremove"), rs.getInt("itemtype"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ca = catemp;
|
ca = catemp;
|
||||||
}
|
}
|
||||||
|
|
||||||
private BaseComponent getTypeDetails(BlockData type, byte[] typeState) {
|
private BaseComponent getTypeDetails(BlockData type, byte[] typeState) {
|
||||||
return getTypeDetails(type, typeState, null, null);
|
return getTypeDetails(type, typeState, null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
private BaseComponent getTypeDetails(BlockData type, byte[] typeState, BlockData oldType, byte[] oldTypeState) {
|
private BaseComponent getTypeDetails(BlockData type, byte[] typeState, BlockData oldType, byte[] oldTypeState) {
|
||||||
BaseComponent typeDetails = null;
|
BaseComponent typeDetails = null;
|
||||||
|
|
||||||
if (BlockStateCodecs.hasCodec(type.getMaterial())) {
|
if (BlockStateCodecs.hasCodec(type.getMaterial())) {
|
||||||
try {
|
try {
|
||||||
typeDetails = BlockStateCodecs.getChangesAsComponent(type.getMaterial(), Utils.deserializeYamlConfiguration(typeState), type.equals(oldType) ? Utils.deserializeYamlConfiguration(oldTypeState) : null);
|
typeDetails = BlockStateCodecs.getChangesAsComponent(type.getMaterial(), Utils.deserializeYamlConfiguration(typeState), type.equals(oldType) ? Utils.deserializeYamlConfiguration(oldTypeState) : null);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LogBlock.getInstance().getLogger().log(Level.SEVERE, "Could not parse BlockState for " + type.getMaterial(), e);
|
LogBlock.getInstance().getLogger().log(Level.SEVERE, "Could not parse BlockState for " + type.getMaterial(), e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (typeDetails == null) {
|
if (typeDetails == null) {
|
||||||
return new TextComponent("");
|
return new TextComponent("");
|
||||||
} else {
|
} else {
|
||||||
TextComponent component = new TextComponent(" ");
|
TextComponent component = new TextComponent(" ");
|
||||||
component.addExtra(typeDetails);
|
component.addExtra(typeDetails);
|
||||||
return component;
|
return component;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return BaseComponent.toPlainText(getLogMessage(-1));
|
return BaseComponent.toPlainText(getLogMessage(-1));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseComponent[] getLogMessage(int entry) {
|
public BaseComponent[] getLogMessage(int entry) {
|
||||||
TextComponent msg = new TextComponent();
|
TextComponent msg = new TextComponent();
|
||||||
if (date > 0) {
|
if (date > 0) {
|
||||||
msg.addExtra(prettyDate(date));
|
msg.addExtra(prettyDate(date));
|
||||||
msg.addExtra(" ");
|
msg.addExtra(" ");
|
||||||
}
|
}
|
||||||
if (actor != null) {
|
if (actor != null) {
|
||||||
msg.addExtra(actor.getName());
|
msg.addExtra(actor.getName());
|
||||||
msg.addExtra(" ");
|
msg.addExtra(" ");
|
||||||
}
|
}
|
||||||
BlockData type = getBlockSet();
|
BlockData type = getBlockSet();
|
||||||
BlockData replaced = getBlockReplaced();
|
BlockData replaced = getBlockReplaced();
|
||||||
if (type == null || replaced == null) {
|
if (type == null || replaced == null) {
|
||||||
msg.addExtra("did an unknown block modification");
|
msg.addExtra("did an unknown block modification");
|
||||||
return new BaseComponent[] { msg };
|
return new BaseComponent[] { msg };
|
||||||
}
|
}
|
||||||
|
|
||||||
// Process type details once for later use.
|
// Process type details once for later use.
|
||||||
BaseComponent typeDetails = getTypeDetails(type, typeState, replaced, replacedState);
|
BaseComponent typeDetails = getTypeDetails(type, typeState, replaced, replacedState);
|
||||||
BaseComponent replacedDetails = getTypeDetails(replaced, replacedState);
|
BaseComponent replacedDetails = getTypeDetails(replaced, replacedState);
|
||||||
|
|
||||||
if (type.getMaterial().equals(replaced.getMaterial()) || (type.getMaterial() == Material.CAKE && BukkitUtils.isCandleCake(replaced.getMaterial()))) {
|
if (type.getMaterial().equals(replaced.getMaterial()) || (type.getMaterial() == Material.CAKE && BukkitUtils.isCandleCake(replaced.getMaterial()))) {
|
||||||
if (BukkitUtils.isEmpty(type.getMaterial())) {
|
if (BukkitUtils.isEmpty(type.getMaterial())) {
|
||||||
msg.addExtra(createTextComponentWithColor("did an unspecified action", INTERACT.getColor()));
|
msg.addExtra(createTextComponentWithColor("did an unspecified action", INTERACT.getColor()));
|
||||||
} else if (ca != null) {
|
} else if (ca != null) {
|
||||||
if (ca.itemStack == null) {
|
if (ca.itemStack == null) {
|
||||||
msg.addExtra(createTextComponentWithColor("looked inside ", INTERACT.getColor()));
|
msg.addExtra(createTextComponentWithColor("looked inside ", INTERACT.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
} else if (ca.remove) {
|
} else if (ca.remove) {
|
||||||
msg.addExtra(createTextComponentWithColor("took ", DESTROY.getColor()));
|
msg.addExtra(createTextComponentWithColor("took ", DESTROY.getColor()));
|
||||||
msg.addExtra(BukkitUtils.toString(ca.itemStack));
|
msg.addExtra(BukkitUtils.toString(ca.itemStack));
|
||||||
msg.addExtra(createTextComponentWithColor(" from ", DESTROY.getColor()));
|
msg.addExtra(createTextComponentWithColor(" from ", DESTROY.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
} else {
|
} else {
|
||||||
msg.addExtra(createTextComponentWithColor("put ", CREATE.getColor()));
|
msg.addExtra(createTextComponentWithColor("put ", CREATE.getColor()));
|
||||||
msg.addExtra(BukkitUtils.toString(ca.itemStack));
|
msg.addExtra(BukkitUtils.toString(ca.itemStack));
|
||||||
msg.addExtra(createTextComponentWithColor(" into ", CREATE.getColor()));
|
msg.addExtra(createTextComponentWithColor(" into ", CREATE.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
}
|
}
|
||||||
} else if (type instanceof Waterlogged && ((Waterlogged) type).isWaterlogged() != ((Waterlogged) replaced).isWaterlogged()) {
|
} else if (type instanceof Waterlogged && ((Waterlogged) type).isWaterlogged() != ((Waterlogged) replaced).isWaterlogged()) {
|
||||||
if (((Waterlogged) type).isWaterlogged()) {
|
if (((Waterlogged) type).isWaterlogged()) {
|
||||||
msg.addExtra(createTextComponentWithColor("waterlogged ", CREATE.getColor()));
|
msg.addExtra(createTextComponentWithColor("waterlogged ", CREATE.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
} else {
|
} else {
|
||||||
msg.addExtra(createTextComponentWithColor("dried ", DESTROY.getColor()));
|
msg.addExtra(createTextComponentWithColor("dried ", DESTROY.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
}
|
}
|
||||||
} else if (BukkitUtils.getContainerBlocks().contains(type.getMaterial())) {
|
} else if (BukkitUtils.getContainerBlocks().contains(type.getMaterial())) {
|
||||||
msg.addExtra(createTextComponentWithColor("opened ", INTERACT.getColor()));
|
msg.addExtra(createTextComponentWithColor("opened ", INTERACT.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
} else if (type instanceof Openable && ((Openable) type).isOpen() != ((Openable) replaced).isOpen()) {
|
} else if (type instanceof Openable && ((Openable) type).isOpen() != ((Openable) replaced).isOpen()) {
|
||||||
// Door, Trapdoor, Fence gate
|
// Door, Trapdoor, Fence gate
|
||||||
msg.addExtra(createTextComponentWithColor(((Openable) type).isOpen() ? "opened " : "closed ", INTERACT.getColor()));
|
msg.addExtra(createTextComponentWithColor(((Openable) type).isOpen() ? "opened " : "closed ", INTERACT.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
} else if (type.getMaterial() == Material.LEVER && ((Switch) type).isPowered() != ((Switch) replaced).isPowered()) {
|
} else if (type.getMaterial() == Material.LEVER && ((Switch) type).isPowered() != ((Switch) replaced).isPowered()) {
|
||||||
msg.addExtra(createTextComponentWithColor("switched ", INTERACT.getColor()));
|
msg.addExtra(createTextComponentWithColor("switched ", INTERACT.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
msg.addExtra(prettyState(((Switch) type).isPowered() ? " on" : " off"));
|
msg.addExtra(prettyState(((Switch) type).isPowered() ? " on" : " off"));
|
||||||
} else if (type instanceof Switch && ((Switch) type).isPowered() != ((Switch) replaced).isPowered()) {
|
} else if (type instanceof Switch && ((Switch) type).isPowered() != ((Switch) replaced).isPowered()) {
|
||||||
msg.addExtra(createTextComponentWithColor("pressed ", INTERACT.getColor()));
|
msg.addExtra(createTextComponentWithColor("pressed ", INTERACT.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
} else if (type.getMaterial() == Material.CAKE) {
|
} else if (type.getMaterial() == Material.CAKE) {
|
||||||
msg.addExtra(createTextComponentWithColor("ate a piece of ", DESTROY.getColor()));
|
msg.addExtra(createTextComponentWithColor("ate a piece of ", DESTROY.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
} else if (type.getMaterial() == Material.NOTE_BLOCK) {
|
} else if (type.getMaterial() == Material.NOTE_BLOCK) {
|
||||||
Note note = ((NoteBlock) type).getNote();
|
Note note = ((NoteBlock) type).getNote();
|
||||||
msg.addExtra(createTextComponentWithColor("set ", INTERACT.getColor()));
|
msg.addExtra(createTextComponentWithColor("set ", INTERACT.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
msg.addExtra(" to ");
|
msg.addExtra(" to ");
|
||||||
msg.addExtra(prettyState(note.getTone().name() + (note.isSharped() ? "#" : "")));
|
msg.addExtra(prettyState(note.getTone().name() + (note.isSharped() ? "#" : "")));
|
||||||
} else if (type.getMaterial() == Material.REPEATER) {
|
} else if (type.getMaterial() == Material.REPEATER) {
|
||||||
msg.addExtra(createTextComponentWithColor("set ", INTERACT.getColor()));
|
msg.addExtra(createTextComponentWithColor("set ", INTERACT.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
msg.addExtra(" to ");
|
msg.addExtra(" to ");
|
||||||
msg.addExtra(prettyState(((Repeater) type).getDelay()));
|
msg.addExtra(prettyState(((Repeater) type).getDelay()));
|
||||||
msg.addExtra(createTextComponentWithColor(" ticks delay", DEFAULT.getColor()));
|
msg.addExtra(createTextComponentWithColor(" ticks delay", DEFAULT.getColor()));
|
||||||
} else if (type.getMaterial() == Material.COMPARATOR) {
|
} else if (type.getMaterial() == Material.COMPARATOR) {
|
||||||
msg.addExtra(createTextComponentWithColor("set ", INTERACT.getColor()));
|
msg.addExtra(createTextComponentWithColor("set ", INTERACT.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
msg.addExtra(" to ");
|
msg.addExtra(" to ");
|
||||||
msg.addExtra(prettyState(((Comparator) type).getMode()));
|
msg.addExtra(prettyState(((Comparator) type).getMode()));
|
||||||
} else if (type.getMaterial() == Material.DAYLIGHT_DETECTOR) {
|
} else if (type.getMaterial() == Material.DAYLIGHT_DETECTOR) {
|
||||||
msg.addExtra(createTextComponentWithColor("set ", INTERACT.getColor()));
|
msg.addExtra(createTextComponentWithColor("set ", INTERACT.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
msg.addExtra(" to ");
|
msg.addExtra(" to ");
|
||||||
msg.addExtra(prettyState(((DaylightDetector) type).isInverted() ? "inverted" : "normal"));
|
msg.addExtra(prettyState(((DaylightDetector) type).isInverted() ? "inverted" : "normal"));
|
||||||
} else if (type instanceof Lectern) {
|
} else if (type instanceof Lectern) {
|
||||||
msg.addExtra(createTextComponentWithColor("changed the book on a ", INTERACT.getColor()));
|
msg.addExtra(createTextComponentWithColor("changed the book on a ", INTERACT.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
msg.addExtra(" to");
|
msg.addExtra(" to");
|
||||||
msg.addExtra(prettyState(typeDetails));
|
msg.addExtra(prettyState(typeDetails));
|
||||||
} else if (type instanceof Powerable) {
|
} else if (type instanceof Powerable) {
|
||||||
msg.addExtra(createTextComponentWithColor("stepped on ", INTERACT.getColor()));
|
msg.addExtra(createTextComponentWithColor("stepped on ", INTERACT.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
} else if (type.getMaterial() == Material.TRIPWIRE) {
|
} else if (type.getMaterial() == Material.TRIPWIRE) {
|
||||||
msg.addExtra(createTextComponentWithColor("ran into ", INTERACT.getColor()));
|
msg.addExtra(createTextComponentWithColor("ran into ", INTERACT.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
} else if (type instanceof Sign || type instanceof WallSign) {
|
} else if (type instanceof Sign || type instanceof WallSign) {
|
||||||
msg.addExtra(createTextComponentWithColor("edited a ", CREATE.getColor()));
|
msg.addExtra(createTextComponentWithColor("edited a ", CREATE.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
msg.addExtra(createTextComponentWithColor(" to", CREATE.getColor()));
|
msg.addExtra(createTextComponentWithColor(" to", CREATE.getColor()));
|
||||||
msg.addExtra(prettyState(typeDetails));
|
msg.addExtra(prettyState(typeDetails));
|
||||||
} else if (type instanceof Candle && ((Candle) type).getCandles() != ((Candle) replaced).getCandles()) {
|
} else if (type instanceof Candle && ((Candle) type).getCandles() != ((Candle) replaced).getCandles()) {
|
||||||
msg.addExtra(createTextComponentWithColor("added a candle to ", CREATE.getColor()));
|
msg.addExtra(createTextComponentWithColor("added a candle to ", CREATE.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
} else if ((type instanceof Candle || BukkitUtils.isCandleCake(type.getMaterial())) && ((Lightable) type).isLit() != ((Lightable) replaced).isLit()) {
|
} else if ((type instanceof Candle || BukkitUtils.isCandleCake(type.getMaterial())) && ((Lightable) type).isLit() != ((Lightable) replaced).isLit()) {
|
||||||
if (((Lightable) type).isLit()) {
|
if (((Lightable) type).isLit()) {
|
||||||
msg.addExtra(createTextComponentWithColor("lit a ", CREATE.getColor()));
|
msg.addExtra(createTextComponentWithColor("lit a ", CREATE.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
} else {
|
} else {
|
||||||
msg.addExtra(createTextComponentWithColor("extinguished a ", CREATE.getColor()));
|
msg.addExtra(createTextComponentWithColor("extinguished a ", CREATE.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
msg.addExtra(createTextComponentWithColor("replaced ", CREATE.getColor()));
|
msg.addExtra(createTextComponentWithColor("replaced ", CREATE.getColor()));
|
||||||
msg.addExtra(prettyMaterial(replaced));
|
msg.addExtra(prettyMaterial(replaced));
|
||||||
msg.addExtra(prettyState(replacedDetails));
|
msg.addExtra(prettyState(replacedDetails));
|
||||||
msg.addExtra(createTextComponentWithColor(" with ", CREATE.getColor()));
|
msg.addExtra(createTextComponentWithColor(" with ", CREATE.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
msg.addExtra(prettyState(typeDetails));
|
msg.addExtra(prettyState(typeDetails));
|
||||||
}
|
}
|
||||||
} else if (BukkitUtils.isEmpty(type.getMaterial())) {
|
} else if (BukkitUtils.isEmpty(type.getMaterial())) {
|
||||||
msg.addExtra(createTextComponentWithColor("destroyed ", DESTROY.getColor()));
|
msg.addExtra(createTextComponentWithColor("destroyed ", DESTROY.getColor()));
|
||||||
msg.addExtra(prettyMaterial(replaced));
|
msg.addExtra(prettyMaterial(replaced));
|
||||||
msg.addExtra(prettyState(replacedDetails));
|
msg.addExtra(prettyState(replacedDetails));
|
||||||
} else if (BukkitUtils.isEmpty(replaced.getMaterial())) {
|
} else if (BukkitUtils.isEmpty(replaced.getMaterial())) {
|
||||||
msg.addExtra(createTextComponentWithColor("created ", CREATE.getColor()));
|
msg.addExtra(createTextComponentWithColor("created ", CREATE.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
msg.addExtra(prettyState(typeDetails));
|
msg.addExtra(prettyState(typeDetails));
|
||||||
} else {
|
} else {
|
||||||
msg.addExtra(createTextComponentWithColor("replaced ", CREATE.getColor()));
|
msg.addExtra(createTextComponentWithColor("replaced ", CREATE.getColor()));
|
||||||
msg.addExtra(prettyMaterial(replaced));
|
msg.addExtra(prettyMaterial(replaced));
|
||||||
msg.addExtra(prettyState(replacedDetails));
|
msg.addExtra(prettyState(replacedDetails));
|
||||||
msg.addExtra(createTextComponentWithColor(" with ", CREATE.getColor()));
|
msg.addExtra(createTextComponentWithColor(" with ", CREATE.getColor()));
|
||||||
msg.addExtra(prettyMaterial(type));
|
msg.addExtra(prettyMaterial(type));
|
||||||
msg.addExtra(prettyState(typeDetails));
|
msg.addExtra(prettyState(typeDetails));
|
||||||
}
|
}
|
||||||
if (loc != null) {
|
if (loc != null) {
|
||||||
msg.addExtra(" at ");
|
msg.addExtra(" at ");
|
||||||
msg.addExtra(prettyLocation(loc, entry));
|
msg.addExtra(prettyLocation(loc, entry));
|
||||||
}
|
}
|
||||||
return new BaseComponent[] { msg };
|
return new BaseComponent[] { msg };
|
||||||
}
|
}
|
||||||
|
|
||||||
public BlockData getBlockReplaced() {
|
public BlockData getBlockReplaced() {
|
||||||
return MaterialConverter.getBlockData(replacedMaterial, replacedData);
|
return MaterialConverter.getBlockData(replacedMaterial, replacedData);
|
||||||
}
|
}
|
||||||
|
|
||||||
public BlockData getBlockSet() {
|
public BlockData getBlockSet() {
|
||||||
return MaterialConverter.getBlockData(typeMaterial, typeData);
|
return MaterialConverter.getBlockData(typeMaterial, typeData);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Location getLocation() {
|
public Location getLocation() {
|
||||||
return loc;
|
return loc;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,59 +1,59 @@
|
|||||||
package de.diddiz.LogBlock;
|
package de.diddiz.LogBlock;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.util.LoggingUtil.checkText;
|
import static de.diddiz.LogBlock.util.LoggingUtil.checkText;
|
||||||
import static de.diddiz.LogBlock.util.MessagingUtil.brackets;
|
import static de.diddiz.LogBlock.util.MessagingUtil.brackets;
|
||||||
import static de.diddiz.LogBlock.util.MessagingUtil.prettyDate;
|
import static de.diddiz.LogBlock.util.MessagingUtil.prettyDate;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.util.MessagingUtil;
|
import de.diddiz.LogBlock.util.MessagingUtil;
|
||||||
import de.diddiz.LogBlock.util.MessagingUtil.BracketType;
|
import de.diddiz.LogBlock.util.MessagingUtil.BracketType;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import net.md_5.bungee.api.chat.BaseComponent;
|
import net.md_5.bungee.api.chat.BaseComponent;
|
||||||
import net.md_5.bungee.api.chat.TextComponent;
|
import net.md_5.bungee.api.chat.TextComponent;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
|
|
||||||
public class ChatMessage implements LookupCacheElement {
|
public class ChatMessage implements LookupCacheElement {
|
||||||
final long id, date;
|
final long id, date;
|
||||||
final String playerName, message;
|
final String playerName, message;
|
||||||
final Actor player;
|
final Actor player;
|
||||||
|
|
||||||
public ChatMessage(Actor player, String message) {
|
public ChatMessage(Actor player, String message) {
|
||||||
id = 0;
|
id = 0;
|
||||||
date = System.currentTimeMillis() / 1000;
|
date = System.currentTimeMillis() / 1000;
|
||||||
this.player = player;
|
this.player = player;
|
||||||
this.message = checkText(message);
|
this.message = checkText(message);
|
||||||
this.playerName = player == null ? null : player.getName();
|
this.playerName = player == null ? null : player.getName();
|
||||||
}
|
}
|
||||||
|
|
||||||
public ChatMessage(ResultSet rs, QueryParams p) throws SQLException {
|
public ChatMessage(ResultSet rs, QueryParams p) throws SQLException {
|
||||||
id = p.needId ? rs.getLong("id") : 0;
|
id = p.needId ? rs.getLong("id") : 0;
|
||||||
date = p.needDate ? rs.getTimestamp("date").getTime() : 0;
|
date = p.needDate ? rs.getTimestamp("date").getTime() : 0;
|
||||||
player = p.needPlayer ? new Actor(rs) : null;
|
player = p.needPlayer ? new Actor(rs) : null;
|
||||||
playerName = p.needPlayer ? rs.getString("playername") : null;
|
playerName = p.needPlayer ? rs.getString("playername") : null;
|
||||||
message = p.needMessage ? rs.getString("message") : null;
|
message = p.needMessage ? rs.getString("message") : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Location getLocation() {
|
public Location getLocation() {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseComponent[] getLogMessage(int entry) {
|
public BaseComponent[] getLogMessage(int entry) {
|
||||||
TextComponent msg = new TextComponent();
|
TextComponent msg = new TextComponent();
|
||||||
if (date > 0) {
|
if (date > 0) {
|
||||||
msg.addExtra(prettyDate(date));
|
msg.addExtra(prettyDate(date));
|
||||||
msg.addExtra(" ");
|
msg.addExtra(" ");
|
||||||
}
|
}
|
||||||
if (playerName != null) {
|
if (playerName != null) {
|
||||||
msg.addExtra(brackets(BracketType.ANGLE, MessagingUtil.createTextComponentWithColor(playerName, net.md_5.bungee.api.ChatColor.WHITE)));
|
msg.addExtra(brackets(BracketType.ANGLE, MessagingUtil.createTextComponentWithColor(playerName, net.md_5.bungee.api.ChatColor.WHITE)));
|
||||||
msg.addExtra(" ");
|
msg.addExtra(" ");
|
||||||
}
|
}
|
||||||
if (message != null) {
|
if (message != null) {
|
||||||
for (BaseComponent messageComponent : TextComponent.fromLegacyText(message)) {
|
for (BaseComponent messageComponent : TextComponent.fromLegacyText(message)) {
|
||||||
msg.addExtra(messageComponent);
|
msg.addExtra(messageComponent);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return new BaseComponent[] { msg };
|
return new BaseComponent[] { msg };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,15 +1,15 @@
|
|||||||
package de.diddiz.LogBlock;
|
package de.diddiz.LogBlock;
|
||||||
|
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
public class ChestAccess {
|
public class ChestAccess {
|
||||||
public final ItemStack itemStack;
|
public final ItemStack itemStack;
|
||||||
public final boolean remove;
|
public final boolean remove;
|
||||||
public final int itemType;
|
public final int itemType;
|
||||||
|
|
||||||
public ChestAccess(ItemStack itemStack, boolean remove, int itemType) {
|
public ChestAccess(ItemStack itemStack, boolean remove, int itemType) {
|
||||||
this.itemStack = itemStack;
|
this.itemStack = itemStack;
|
||||||
this.remove = remove;
|
this.remove = remove;
|
||||||
this.itemType = itemType;
|
this.itemType = itemType;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,147 +1,147 @@
|
|||||||
package de.diddiz.LogBlock;
|
package de.diddiz.LogBlock;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.util.Utils.newline;
|
import static de.diddiz.LogBlock.util.Utils.newline;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.util.Utils.ExtensionFilenameFilter;
|
import de.diddiz.LogBlock.util.Utils.ExtensionFilenameFilter;
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.sql.Statement;
|
import java.sql.Statement;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
public class DumpedLogImporter implements Runnable {
|
public class DumpedLogImporter implements Runnable {
|
||||||
private final LogBlock logblock;
|
private final LogBlock logblock;
|
||||||
|
|
||||||
DumpedLogImporter(LogBlock logblock) {
|
DumpedLogImporter(LogBlock logblock) {
|
||||||
this.logblock = logblock;
|
this.logblock = logblock;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
final File[] imports = new File(logblock.getDataFolder(), "import").listFiles(new ExtensionFilenameFilter("sql"));
|
final File[] imports = new File(logblock.getDataFolder(), "import").listFiles(new ExtensionFilenameFilter("sql"));
|
||||||
if (imports != null && imports.length > 0) {
|
if (imports != null && imports.length > 0) {
|
||||||
logblock.getLogger().info("Found " + imports.length + " imports.");
|
logblock.getLogger().info("Found " + imports.length + " imports.");
|
||||||
Arrays.sort(imports, new ImportsComparator());
|
Arrays.sort(imports, new ImportsComparator());
|
||||||
Connection conn = null;
|
Connection conn = null;
|
||||||
try {
|
try {
|
||||||
conn = logblock.getConnection();
|
conn = logblock.getConnection();
|
||||||
if (conn == null) {
|
if (conn == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
conn.setAutoCommit(false);
|
conn.setAutoCommit(false);
|
||||||
final Statement st = conn.createStatement();
|
final Statement st = conn.createStatement();
|
||||||
final BufferedWriter writer = new BufferedWriter(new FileWriter(new File(logblock.getDataFolder(), "import/failed.txt")));
|
final BufferedWriter writer = new BufferedWriter(new FileWriter(new File(logblock.getDataFolder(), "import/failed.txt")));
|
||||||
int successes = 0, errors = 0;
|
int successes = 0, errors = 0;
|
||||||
try {
|
try {
|
||||||
for (final File sqlFile : imports) {
|
for (final File sqlFile : imports) {
|
||||||
String line = null;
|
String line = null;
|
||||||
try {
|
try {
|
||||||
logblock.getLogger().info("Trying to import " + sqlFile.getName() + " ...");
|
logblock.getLogger().info("Trying to import " + sqlFile.getName() + " ...");
|
||||||
// first try batch import the whole file
|
// first try batch import the whole file
|
||||||
final BufferedReader reader = new BufferedReader(new FileReader(sqlFile));
|
final BufferedReader reader = new BufferedReader(new FileReader(sqlFile));
|
||||||
int statements = 0;
|
int statements = 0;
|
||||||
while ((line = reader.readLine()) != null) {
|
while ((line = reader.readLine()) != null) {
|
||||||
if (line.endsWith(";")) {
|
if (line.endsWith(";")) {
|
||||||
line = line.substring(0, line.length() - 1);
|
line = line.substring(0, line.length() - 1);
|
||||||
}
|
}
|
||||||
if (!line.isEmpty()) {
|
if (!line.isEmpty()) {
|
||||||
statements++;
|
statements++;
|
||||||
st.addBatch(line);
|
st.addBatch(line);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
st.executeBatch();
|
st.executeBatch();
|
||||||
conn.commit();
|
conn.commit();
|
||||||
reader.close();
|
reader.close();
|
||||||
sqlFile.delete();
|
sqlFile.delete();
|
||||||
successes += statements;
|
successes += statements;
|
||||||
logblock.getLogger().info("Successfully imported " + sqlFile.getName() + ".");
|
logblock.getLogger().info("Successfully imported " + sqlFile.getName() + ".");
|
||||||
} catch (final Exception ignored) {
|
} catch (final Exception ignored) {
|
||||||
// if the batch import did not work, retry line by line
|
// if the batch import did not work, retry line by line
|
||||||
try {
|
try {
|
||||||
final BufferedReader reader = new BufferedReader(new FileReader(sqlFile));
|
final BufferedReader reader = new BufferedReader(new FileReader(sqlFile));
|
||||||
while ((line = reader.readLine()) != null) {
|
while ((line = reader.readLine()) != null) {
|
||||||
if (line.endsWith(";")) {
|
if (line.endsWith(";")) {
|
||||||
line = line.substring(0, line.length() - 1);
|
line = line.substring(0, line.length() - 1);
|
||||||
}
|
}
|
||||||
if (!line.isEmpty()) {
|
if (!line.isEmpty()) {
|
||||||
try {
|
try {
|
||||||
st.execute(line);
|
st.execute(line);
|
||||||
successes++;
|
successes++;
|
||||||
} catch (final SQLException ex) {
|
} catch (final SQLException ex) {
|
||||||
logblock.getLogger().severe("Error while importing: '" + line + "': " + ex.getMessage());
|
logblock.getLogger().severe("Error while importing: '" + line + "': " + ex.getMessage());
|
||||||
writer.write(line + newline);
|
writer.write(line + newline);
|
||||||
errors++;
|
errors++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
conn.commit();
|
conn.commit();
|
||||||
reader.close();
|
reader.close();
|
||||||
sqlFile.delete();
|
sqlFile.delete();
|
||||||
logblock.getLogger().info("Successfully imported " + sqlFile.getName() + ".");
|
logblock.getLogger().info("Successfully imported " + sqlFile.getName() + ".");
|
||||||
} catch (final Exception ex) {
|
} catch (final Exception ex) {
|
||||||
logblock.getLogger().severe("Error while importing " + sqlFile.getName() + ": " + ex.getMessage());
|
logblock.getLogger().severe("Error while importing " + sqlFile.getName() + ": " + ex.getMessage());
|
||||||
errors++;
|
errors++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
writer.close();
|
writer.close();
|
||||||
}
|
}
|
||||||
st.close();
|
st.close();
|
||||||
logblock.getLogger().info("Successfully imported stored queue. (" + successes + " rows imported, " + errors + " errors)");
|
logblock.getLogger().info("Successfully imported stored queue. (" + successes + " rows imported, " + errors + " errors)");
|
||||||
} catch (final Exception ex) {
|
} catch (final Exception ex) {
|
||||||
logblock.getLogger().log(Level.WARNING, "Error while importing: ", ex);
|
logblock.getLogger().log(Level.WARNING, "Error while importing: ", ex);
|
||||||
} finally {
|
} finally {
|
||||||
if (conn != null) {
|
if (conn != null) {
|
||||||
try {
|
try {
|
||||||
conn.close();
|
conn.close();
|
||||||
} catch (final SQLException ex) {
|
} catch (final SQLException ex) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class ImportsComparator implements Comparator<File> {
|
private static class ImportsComparator implements Comparator<File> {
|
||||||
private final Pattern splitPattern = Pattern.compile("[\\-\\.]");
|
private final Pattern splitPattern = Pattern.compile("[\\-\\.]");
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int compare(File o1, File o2) {
|
public int compare(File o1, File o2) {
|
||||||
String[] name1 = splitPattern.split(o1.getName());
|
String[] name1 = splitPattern.split(o1.getName());
|
||||||
String[] name2 = splitPattern.split(o2.getName());
|
String[] name2 = splitPattern.split(o2.getName());
|
||||||
if (name1.length > name2.length) {
|
if (name1.length > name2.length) {
|
||||||
return 1;
|
return 1;
|
||||||
} else if (name1.length < name2.length) {
|
} else if (name1.length < name2.length) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
for (int i = 0; i < name1.length; i++) {
|
for (int i = 0; i < name1.length; i++) {
|
||||||
String part1 = name1[i];
|
String part1 = name1[i];
|
||||||
String part2 = name2[i];
|
String part2 = name2[i];
|
||||||
if (part1.length() > 0 && part2.length() > 0) {
|
if (part1.length() > 0 && part2.length() > 0) {
|
||||||
char first1 = part1.charAt(0);
|
char first1 = part1.charAt(0);
|
||||||
char first2 = part2.charAt(0);
|
char first2 = part2.charAt(0);
|
||||||
if (first1 >= '0' && first1 <= '9' && first2 >= '0' && first2 <= '9') {
|
if (first1 >= '0' && first1 <= '9' && first2 >= '0' && first2 <= '9') {
|
||||||
try {
|
try {
|
||||||
long long1 = Long.parseLong(part1);
|
long long1 = Long.parseLong(part1);
|
||||||
long long2 = Long.parseLong(part2);
|
long long2 = Long.parseLong(part2);
|
||||||
if (long1 == long2) {
|
if (long1 == long2) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
return long1 > long2 ? 1 : -1;
|
return long1 > long2 ? 1 : -1;
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
// fallthrough to string compare
|
// fallthrough to string compare
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
int compareString = part1.compareTo(part2);
|
int compareString = part1.compareTo(part2);
|
||||||
if (compareString != 0) {
|
if (compareString != 0) {
|
||||||
return compareString;
|
return compareString;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,378 +1,378 @@
|
|||||||
package de.diddiz.LogBlock;
|
package de.diddiz.LogBlock;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.addons.worldguard.WorldGuardLoggingFlagsAddon;
|
import de.diddiz.LogBlock.addons.worldguard.WorldGuardLoggingFlagsAddon;
|
||||||
import de.diddiz.LogBlock.config.Config;
|
import de.diddiz.LogBlock.config.Config;
|
||||||
import de.diddiz.LogBlock.listeners.*;
|
import de.diddiz.LogBlock.listeners.*;
|
||||||
import de.diddiz.LogBlock.questioner.Questioner;
|
import de.diddiz.LogBlock.questioner.Questioner;
|
||||||
import de.diddiz.LogBlock.util.BukkitUtils;
|
import de.diddiz.LogBlock.util.BukkitUtils;
|
||||||
import de.diddiz.LogBlock.util.MySQLConnectionPool;
|
import de.diddiz.LogBlock.util.MySQLConnectionPool;
|
||||||
import de.diddiz.LogBlock.worldedit.WorldEditHelper;
|
import de.diddiz.LogBlock.worldedit.WorldEditHelper;
|
||||||
import de.diddiz.LogBlock.worldedit.WorldEditLoggingHook;
|
import de.diddiz.LogBlock.worldedit.WorldEditLoggingHook;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.command.Command;
|
import org.bukkit.command.Command;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.permissions.Permission;
|
import org.bukkit.permissions.Permission;
|
||||||
import org.bukkit.plugin.PluginManager;
|
import org.bukkit.plugin.PluginManager;
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.sql.Statement;
|
import java.sql.Statement;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.*;
|
import static de.diddiz.LogBlock.config.Config.*;
|
||||||
import static org.bukkit.Bukkit.getPluginManager;
|
import static org.bukkit.Bukkit.getPluginManager;
|
||||||
|
|
||||||
public class LogBlock extends JavaPlugin {
|
public class LogBlock extends JavaPlugin {
|
||||||
private static LogBlock logblock = null;
|
private static LogBlock logblock = null;
|
||||||
private MySQLConnectionPool pool;
|
private MySQLConnectionPool pool;
|
||||||
private Consumer consumer = null;
|
private Consumer consumer = null;
|
||||||
private CommandsHandler commandsHandler;
|
private CommandsHandler commandsHandler;
|
||||||
private boolean noDb = false, connected = true;
|
private boolean noDb = false, connected = true;
|
||||||
private PlayerInfoLogging playerInfoLogging;
|
private PlayerInfoLogging playerInfoLogging;
|
||||||
private ScaffoldingLogging scaffoldingLogging;
|
private ScaffoldingLogging scaffoldingLogging;
|
||||||
private Questioner questioner;
|
private Questioner questioner;
|
||||||
private WorldGuardLoggingFlagsAddon worldGuardLoggingFlagsAddon;
|
private WorldGuardLoggingFlagsAddon worldGuardLoggingFlagsAddon;
|
||||||
private boolean isConfigLoaded;
|
private boolean isConfigLoaded;
|
||||||
private volatile boolean isCompletelyEnabled;
|
private volatile boolean isCompletelyEnabled;
|
||||||
|
|
||||||
public static LogBlock getInstance() {
|
public static LogBlock getInstance() {
|
||||||
return logblock;
|
return logblock;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isCompletelyEnabled() {
|
public boolean isCompletelyEnabled() {
|
||||||
return isCompletelyEnabled;
|
return isCompletelyEnabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Consumer getConsumer() {
|
public Consumer getConsumer() {
|
||||||
return consumer;
|
return consumer;
|
||||||
}
|
}
|
||||||
|
|
||||||
public CommandsHandler getCommandsHandler() {
|
public CommandsHandler getCommandsHandler() {
|
||||||
return commandsHandler;
|
return commandsHandler;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onLoad() {
|
public void onLoad() {
|
||||||
logblock = this;
|
logblock = this;
|
||||||
BukkitUtils.isDoublePlant(Material.AIR); // Force static code to run
|
BukkitUtils.isDoublePlant(Material.AIR); // Force static code to run
|
||||||
try {
|
try {
|
||||||
Config.load(this);
|
Config.load(this);
|
||||||
isConfigLoaded = true;
|
isConfigLoaded = true;
|
||||||
} catch (final Exception ex) {
|
} catch (final Exception ex) {
|
||||||
getLogger().log(Level.SEVERE, "Could not load LogBlock config! " + ex.getMessage(), ex);
|
getLogger().log(Level.SEVERE, "Could not load LogBlock config! " + ex.getMessage(), ex);
|
||||||
}
|
}
|
||||||
if (Config.worldGuardLoggingFlags) {
|
if (Config.worldGuardLoggingFlags) {
|
||||||
if (getServer().getPluginManager().getPlugin("WorldGuard") == null) {
|
if (getServer().getPluginManager().getPlugin("WorldGuard") == null) {
|
||||||
getLogger().log(Level.SEVERE, "Invalid config! addons.worldguardLoggingFlags is set to true, but WorldGuard is not loaded.");
|
getLogger().log(Level.SEVERE, "Invalid config! addons.worldguardLoggingFlags is set to true, but WorldGuard is not loaded.");
|
||||||
} else {
|
} else {
|
||||||
worldGuardLoggingFlagsAddon = new WorldGuardLoggingFlagsAddon(this);
|
worldGuardLoggingFlagsAddon = new WorldGuardLoggingFlagsAddon(this);
|
||||||
worldGuardLoggingFlagsAddon.onPluginLoad();
|
worldGuardLoggingFlagsAddon.onPluginLoad();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEnable() {
|
public void onEnable() {
|
||||||
final PluginManager pm = getPluginManager();
|
final PluginManager pm = getPluginManager();
|
||||||
if (!isConfigLoaded) {
|
if (!isConfigLoaded) {
|
||||||
pm.disablePlugin(this);
|
pm.disablePlugin(this);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
consumer = new Consumer(this);
|
consumer = new Consumer(this);
|
||||||
try {
|
try {
|
||||||
getLogger().info("Connecting to " + user + "@" + url + "...");
|
getLogger().info("Connecting to " + user + "@" + url + "...");
|
||||||
try {
|
try {
|
||||||
Class.forName("com.mysql.cj.jdbc.Driver");
|
Class.forName("com.mysql.cj.jdbc.Driver");
|
||||||
} catch (ClassNotFoundException ignored) {
|
} catch (ClassNotFoundException ignored) {
|
||||||
Class.forName("com.mysql.jdbc.Driver");
|
Class.forName("com.mysql.jdbc.Driver");
|
||||||
}
|
}
|
||||||
pool = new MySQLConnectionPool(url, user, password, mysqlUseSSL, mysqlRequireSSL);
|
pool = new MySQLConnectionPool(url, user, password, mysqlUseSSL, mysqlRequireSSL);
|
||||||
final Connection conn = getConnection(true);
|
final Connection conn = getConnection(true);
|
||||||
if (conn == null) {
|
if (conn == null) {
|
||||||
noDb = true;
|
noDb = true;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final Statement st = conn.createStatement();
|
final Statement st = conn.createStatement();
|
||||||
final ResultSet rs = st.executeQuery("SHOW CHARACTER SET where charset='utf8mb4';");
|
final ResultSet rs = st.executeQuery("SHOW CHARACTER SET where charset='utf8mb4';");
|
||||||
if (rs.next()) {
|
if (rs.next()) {
|
||||||
Config.mb4 = true;
|
Config.mb4 = true;
|
||||||
// Allegedly JDBC driver since 2010 hasn't needed this. I did.
|
// Allegedly JDBC driver since 2010 hasn't needed this. I did.
|
||||||
st.executeUpdate("SET NAMES utf8mb4;");
|
st.executeUpdate("SET NAMES utf8mb4;");
|
||||||
}
|
}
|
||||||
conn.close();
|
conn.close();
|
||||||
Updater updater = new Updater(this);
|
Updater updater = new Updater(this);
|
||||||
updater.checkTables();
|
updater.checkTables();
|
||||||
MaterialConverter.initializeMaterials(getConnection());
|
MaterialConverter.initializeMaterials(getConnection());
|
||||||
MaterialConverter.getOrAddMaterialId(Material.AIR); // AIR must be the first entry
|
MaterialConverter.getOrAddMaterialId(Material.AIR); // AIR must be the first entry
|
||||||
EntityTypeConverter.initializeEntityTypes(getConnection());
|
EntityTypeConverter.initializeEntityTypes(getConnection());
|
||||||
if (updater.update()) {
|
if (updater.update()) {
|
||||||
load(this);
|
load(this);
|
||||||
}
|
}
|
||||||
} catch (final NullPointerException ex) {
|
} catch (final NullPointerException ex) {
|
||||||
getLogger().log(Level.SEVERE, "Error while loading: ", ex);
|
getLogger().log(Level.SEVERE, "Error while loading: ", ex);
|
||||||
} catch (final Exception ex) {
|
} catch (final Exception ex) {
|
||||||
getLogger().log(Level.SEVERE, "Error while loading: " + ex.getMessage(), ex);
|
getLogger().log(Level.SEVERE, "Error while loading: " + ex.getMessage(), ex);
|
||||||
pm.disablePlugin(this);
|
pm.disablePlugin(this);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (WorldEditHelper.hasWorldEdit()) {
|
if (WorldEditHelper.hasWorldEdit()) {
|
||||||
new WorldEditLoggingHook(this).hook();
|
new WorldEditLoggingHook(this).hook();
|
||||||
}
|
}
|
||||||
commandsHandler = new CommandsHandler(this);
|
commandsHandler = new CommandsHandler(this);
|
||||||
getCommand("lb").setExecutor(commandsHandler);
|
getCommand("lb").setExecutor(commandsHandler);
|
||||||
if (enableAutoClearLog && autoClearLogDelay > 0) {
|
if (enableAutoClearLog && autoClearLogDelay > 0) {
|
||||||
getServer().getScheduler().runTaskTimerAsynchronously(this, new AutoClearLog(this), 6000, autoClearLogDelay * 60 * 20);
|
getServer().getScheduler().runTaskTimerAsynchronously(this, new AutoClearLog(this), 6000, autoClearLogDelay * 60 * 20);
|
||||||
}
|
}
|
||||||
new DumpedLogImporter(this).run();
|
new DumpedLogImporter(this).run();
|
||||||
registerEvents();
|
registerEvents();
|
||||||
consumer.start();
|
consumer.start();
|
||||||
for (final Tool tool : toolsByType.values()) {
|
for (final Tool tool : toolsByType.values()) {
|
||||||
if (pm.getPermission("logblock.tools." + tool.name) == null) {
|
if (pm.getPermission("logblock.tools." + tool.name) == null) {
|
||||||
final Permission perm = new Permission("logblock.tools." + tool.name, tool.permissionDefault);
|
final Permission perm = new Permission("logblock.tools." + tool.name, tool.permissionDefault);
|
||||||
pm.addPermission(perm);
|
pm.addPermission(perm);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
questioner = new Questioner(this);
|
questioner = new Questioner(this);
|
||||||
if (worldGuardLoggingFlagsAddon != null) {
|
if (worldGuardLoggingFlagsAddon != null) {
|
||||||
worldGuardLoggingFlagsAddon.onPluginEnable();
|
worldGuardLoggingFlagsAddon.onPluginEnable();
|
||||||
}
|
}
|
||||||
isCompletelyEnabled = true;
|
isCompletelyEnabled = true;
|
||||||
getServer().getScheduler().runTaskAsynchronously(this, new Updater.PlayerCountChecker(this));
|
getServer().getScheduler().runTaskAsynchronously(this, new Updater.PlayerCountChecker(this));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void registerEvents() {
|
private void registerEvents() {
|
||||||
final PluginManager pm = getPluginManager();
|
final PluginManager pm = getPluginManager();
|
||||||
pm.registerEvents(new ToolListener(this), this);
|
pm.registerEvents(new ToolListener(this), this);
|
||||||
pm.registerEvents(playerInfoLogging = new PlayerInfoLogging(this), this);
|
pm.registerEvents(playerInfoLogging = new PlayerInfoLogging(this), this);
|
||||||
if (askRollbackAfterBan) {
|
if (askRollbackAfterBan) {
|
||||||
pm.registerEvents(new BanListener(this), this);
|
pm.registerEvents(new BanListener(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.BLOCKPLACE)) {
|
if (isLogging(Logging.BLOCKPLACE)) {
|
||||||
pm.registerEvents(new BlockPlaceLogging(this), this);
|
pm.registerEvents(new BlockPlaceLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.LAVAFLOW) || isLogging(Logging.WATERFLOW)) {
|
if (isLogging(Logging.LAVAFLOW) || isLogging(Logging.WATERFLOW)) {
|
||||||
pm.registerEvents(new FluidFlowLogging(this), this);
|
pm.registerEvents(new FluidFlowLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.BLOCKBREAK)) {
|
if (isLogging(Logging.BLOCKBREAK)) {
|
||||||
pm.registerEvents(new BlockBreakLogging(this), this);
|
pm.registerEvents(new BlockBreakLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.SIGNTEXT)) {
|
if (isLogging(Logging.SIGNTEXT)) {
|
||||||
pm.registerEvents(new SignChangeLogging(this), this);
|
pm.registerEvents(new SignChangeLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.FIRE)) {
|
if (isLogging(Logging.FIRE)) {
|
||||||
pm.registerEvents(new BlockBurnLogging(this), this);
|
pm.registerEvents(new BlockBurnLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.SNOWFORM)) {
|
if (isLogging(Logging.SNOWFORM)) {
|
||||||
pm.registerEvents(new SnowFormLogging(this), this);
|
pm.registerEvents(new SnowFormLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.SNOWFADE)) {
|
if (isLogging(Logging.SNOWFADE)) {
|
||||||
pm.registerEvents(new SnowFadeLogging(this), this);
|
pm.registerEvents(new SnowFadeLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.SCAFFOLDING)) {
|
if (isLogging(Logging.SCAFFOLDING)) {
|
||||||
pm.registerEvents(scaffoldingLogging = new ScaffoldingLogging(this), this);
|
pm.registerEvents(scaffoldingLogging = new ScaffoldingLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.CAULDRONINTERACT)) {
|
if (isLogging(Logging.CAULDRONINTERACT)) {
|
||||||
pm.registerEvents(new CauldronLogging(this), this);
|
pm.registerEvents(new CauldronLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.CREEPEREXPLOSION) || isLogging(Logging.TNTEXPLOSION) || isLogging(Logging.GHASTFIREBALLEXPLOSION) || isLogging(Logging.ENDERDRAGON) || isLogging(Logging.MISCEXPLOSION)) {
|
if (isLogging(Logging.CREEPEREXPLOSION) || isLogging(Logging.TNTEXPLOSION) || isLogging(Logging.GHASTFIREBALLEXPLOSION) || isLogging(Logging.ENDERDRAGON) || isLogging(Logging.MISCEXPLOSION)) {
|
||||||
pm.registerEvents(new ExplosionLogging(this), this);
|
pm.registerEvents(new ExplosionLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.LEAVESDECAY)) {
|
if (isLogging(Logging.LEAVESDECAY)) {
|
||||||
pm.registerEvents(new LeavesDecayLogging(this), this);
|
pm.registerEvents(new LeavesDecayLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.CHESTACCESS)) {
|
if (isLogging(Logging.CHESTACCESS)) {
|
||||||
pm.registerEvents(new ChestAccessLogging(this), this);
|
pm.registerEvents(new ChestAccessLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.BLOCKBREAK) || isLogging(Logging.BLOCKPLACE) || isLogging(Logging.SWITCHINTERACT) || isLogging(Logging.DOORINTERACT) || isLogging(Logging.CAKEEAT) || isLogging(Logging.DIODEINTERACT) || isLogging(Logging.COMPARATORINTERACT) || isLogging(Logging.NOTEBLOCKINTERACT)
|
if (isLogging(Logging.BLOCKBREAK) || isLogging(Logging.BLOCKPLACE) || isLogging(Logging.SWITCHINTERACT) || isLogging(Logging.DOORINTERACT) || isLogging(Logging.CAKEEAT) || isLogging(Logging.DIODEINTERACT) || isLogging(Logging.COMPARATORINTERACT) || isLogging(Logging.NOTEBLOCKINTERACT)
|
||||||
|| isLogging(Logging.PRESUREPLATEINTERACT) || isLogging(Logging.TRIPWIREINTERACT) || isLogging(Logging.CROPTRAMPLE)) {
|
|| isLogging(Logging.PRESUREPLATEINTERACT) || isLogging(Logging.TRIPWIREINTERACT) || isLogging(Logging.CROPTRAMPLE)) {
|
||||||
pm.registerEvents(new InteractLogging(this), this);
|
pm.registerEvents(new InteractLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.CREATURECROPTRAMPLE)) {
|
if (isLogging(Logging.CREATURECROPTRAMPLE)) {
|
||||||
pm.registerEvents(new CreatureInteractLogging(this), this);
|
pm.registerEvents(new CreatureInteractLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.KILL)) {
|
if (isLogging(Logging.KILL)) {
|
||||||
pm.registerEvents(new KillLogging(this), this);
|
pm.registerEvents(new KillLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.CHAT) || isLogging(Logging.PLAYER_COMMANDS) || isLogging(Logging.CONSOLE_COMMANDS) || isLogging(Logging.COMMANDBLOCK_COMMANDS)) {
|
if (isLogging(Logging.CHAT) || isLogging(Logging.PLAYER_COMMANDS) || isLogging(Logging.CONSOLE_COMMANDS) || isLogging(Logging.COMMANDBLOCK_COMMANDS)) {
|
||||||
pm.registerEvents(new ChatLogging(this), this);
|
pm.registerEvents(new ChatLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.ENDERMEN)) {
|
if (isLogging(Logging.ENDERMEN)) {
|
||||||
pm.registerEvents(new EndermenLogging(this), this);
|
pm.registerEvents(new EndermenLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.WITHER)) {
|
if (isLogging(Logging.WITHER)) {
|
||||||
pm.registerEvents(new WitherLogging(this), this);
|
pm.registerEvents(new WitherLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.NATURALSTRUCTUREGROW)) {
|
if (isLogging(Logging.NATURALSTRUCTUREGROW)) {
|
||||||
pm.registerEvents(new StructureGrowLogging(this), this);
|
pm.registerEvents(new StructureGrowLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.BONEMEALSTRUCTUREGROW)) {
|
if (isLogging(Logging.BONEMEALSTRUCTUREGROW)) {
|
||||||
pm.registerEvents(new BlockFertilizeLogging(this), this);
|
pm.registerEvents(new BlockFertilizeLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.GRASSGROWTH) || isLogging(Logging.MYCELIUMSPREAD) || isLogging(Logging.VINEGROWTH) || isLogging(Logging.MUSHROOMSPREAD) || isLogging(Logging.BAMBOOGROWTH) || isLogging(Logging.DRIPSTONEGROWTH) || isLogging(Logging.SCULKSPREAD)) {
|
if (isLogging(Logging.GRASSGROWTH) || isLogging(Logging.MYCELIUMSPREAD) || isLogging(Logging.VINEGROWTH) || isLogging(Logging.MUSHROOMSPREAD) || isLogging(Logging.BAMBOOGROWTH) || isLogging(Logging.DRIPSTONEGROWTH) || isLogging(Logging.SCULKSPREAD)) {
|
||||||
pm.registerEvents(new BlockSpreadLogging(this), this);
|
pm.registerEvents(new BlockSpreadLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.DRAGONEGGTELEPORT)) {
|
if (isLogging(Logging.DRAGONEGGTELEPORT)) {
|
||||||
pm.registerEvents(new DragonEggLogging(this), this);
|
pm.registerEvents(new DragonEggLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.LECTERNBOOKCHANGE)) {
|
if (isLogging(Logging.LECTERNBOOKCHANGE)) {
|
||||||
pm.registerEvents(new LecternLogging(this), this);
|
pm.registerEvents(new LecternLogging(this), this);
|
||||||
}
|
}
|
||||||
if (isLogging(Logging.OXIDIZATION)) {
|
if (isLogging(Logging.OXIDIZATION)) {
|
||||||
pm.registerEvents(new OxidizationLogging(this), this);
|
pm.registerEvents(new OxidizationLogging(this), this);
|
||||||
}
|
}
|
||||||
if (Config.isLoggingAnyEntities()) {
|
if (Config.isLoggingAnyEntities()) {
|
||||||
if (!WorldEditHelper.hasFullWorldEdit()) {
|
if (!WorldEditHelper.hasFullWorldEdit()) {
|
||||||
getLogger().severe("No compatible WorldEdit found, entity logging will not work!");
|
getLogger().severe("No compatible WorldEdit found, entity logging will not work!");
|
||||||
} else {
|
} else {
|
||||||
pm.registerEvents(new AdvancedEntityLogging(this), this);
|
pm.registerEvents(new AdvancedEntityLogging(this), this);
|
||||||
getLogger().info("Entity logging enabled!");
|
getLogger().info("Entity logging enabled!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDisable() {
|
public void onDisable() {
|
||||||
isCompletelyEnabled = false;
|
isCompletelyEnabled = false;
|
||||||
getServer().getScheduler().cancelTasks(this);
|
getServer().getScheduler().cancelTasks(this);
|
||||||
if (consumer != null) {
|
if (consumer != null) {
|
||||||
if (logPlayerInfo && playerInfoLogging != null) {
|
if (logPlayerInfo && playerInfoLogging != null) {
|
||||||
for (final Player player : getServer().getOnlinePlayers()) {
|
for (final Player player : getServer().getOnlinePlayers()) {
|
||||||
playerInfoLogging.onPlayerQuit(player);
|
playerInfoLogging.onPlayerQuit(player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
getLogger().info("Waiting for consumer ...");
|
getLogger().info("Waiting for consumer ...");
|
||||||
consumer.shutdown();
|
consumer.shutdown();
|
||||||
if (consumer.getQueueSize() > 0) {
|
if (consumer.getQueueSize() > 0) {
|
||||||
getLogger().info("Remaining queue size: " + consumer.getQueueSize() + ". Trying to write to a local file.");
|
getLogger().info("Remaining queue size: " + consumer.getQueueSize() + ". Trying to write to a local file.");
|
||||||
try {
|
try {
|
||||||
consumer.writeToFile();
|
consumer.writeToFile();
|
||||||
getLogger().info("Successfully dumped queue.");
|
getLogger().info("Successfully dumped queue.");
|
||||||
} catch (final FileNotFoundException ex) {
|
} catch (final FileNotFoundException ex) {
|
||||||
getLogger().info("Failed to write. Given up.");
|
getLogger().info("Failed to write. Given up.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (pool != null) {
|
if (pool != null) {
|
||||||
pool.close();
|
pool.close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
|
public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
|
||||||
if (noDb) {
|
if (noDb) {
|
||||||
sender.sendMessage(ChatColor.RED + "No database connected. Check your MySQL user/pw and database for typos. Start/restart your MySQL server.");
|
sender.sendMessage(ChatColor.RED + "No database connected. Check your MySQL user/pw and database for typos. Start/restart your MySQL server.");
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasPermission(CommandSender sender, String permission) {
|
public boolean hasPermission(CommandSender sender, String permission) {
|
||||||
return sender.hasPermission(permission);
|
return sender.hasPermission(permission);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Connection getConnection() {
|
public Connection getConnection() {
|
||||||
return getConnection(false);
|
return getConnection(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Connection getConnection(boolean testConnection) {
|
public Connection getConnection(boolean testConnection) {
|
||||||
try {
|
try {
|
||||||
final Connection conn = pool.getConnection();
|
final Connection conn = pool.getConnection();
|
||||||
if (!connected) {
|
if (!connected) {
|
||||||
getLogger().info("MySQL connection rebuild");
|
getLogger().info("MySQL connection rebuild");
|
||||||
connected = true;
|
connected = true;
|
||||||
}
|
}
|
||||||
return conn;
|
return conn;
|
||||||
} catch (final Exception ex) {
|
} catch (final Exception ex) {
|
||||||
if (testConnection) {
|
if (testConnection) {
|
||||||
getLogger().log(Level.SEVERE, "Could not connect to the Database! Please check your config! " + ex.getMessage());
|
getLogger().log(Level.SEVERE, "Could not connect to the Database! Please check your config! " + ex.getMessage());
|
||||||
} else if (connected) {
|
} else if (connected) {
|
||||||
getLogger().log(Level.SEVERE, "Error while fetching connection: ", ex);
|
getLogger().log(Level.SEVERE, "Error while fetching connection: ", ex);
|
||||||
connected = false;
|
connected = false;
|
||||||
} else {
|
} else {
|
||||||
getLogger().log(Level.SEVERE, "MySQL connection lost", ex);
|
getLogger().log(Level.SEVERE, "MySQL connection lost", ex);
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns a list of block changes based on the given query parameters, the query parameters
|
* Returns a list of block changes based on the given query parameters, the query parameters
|
||||||
* are essentially programmatic versions of the parameters a player would pass
|
* are essentially programmatic versions of the parameters a player would pass
|
||||||
* to the logblock lookup command i.e /lb lookup <i>query-parameters</i>
|
* to the logblock lookup command i.e /lb lookup <i>query-parameters</i>
|
||||||
*
|
*
|
||||||
* Note: this method directly calls a SQL query and is hence a slow blocking function, avoid running
|
* Note: this method directly calls a SQL query and is hence a slow blocking function, avoid running
|
||||||
* it on the main game thread
|
* it on the main game thread
|
||||||
*
|
*
|
||||||
* @param params QueryParams that contains the needed columns (all other will be filled with default values) and the params. World is required.
|
* @param params QueryParams that contains the needed columns (all other will be filled with default values) and the params. World is required.
|
||||||
* @return Returns a list of block changes based on the given query parameters
|
* @return Returns a list of block changes based on the given query parameters
|
||||||
* @throws SQLException if a sql exception occurs while looking up the block changes
|
* @throws SQLException if a sql exception occurs while looking up the block changes
|
||||||
*/
|
*/
|
||||||
public List<BlockChange> getBlockChanges(QueryParams params) throws SQLException {
|
public List<BlockChange> getBlockChanges(QueryParams params) throws SQLException {
|
||||||
final Connection conn = getConnection();
|
final Connection conn = getConnection();
|
||||||
Statement state = null;
|
Statement state = null;
|
||||||
if (conn == null) {
|
if (conn == null) {
|
||||||
throw new SQLException("No connection");
|
throw new SQLException("No connection");
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
state = conn.createStatement();
|
state = conn.createStatement();
|
||||||
final ResultSet rs = state.executeQuery(params.getQuery());
|
final ResultSet rs = state.executeQuery(params.getQuery());
|
||||||
final List<BlockChange> blockchanges = new ArrayList<>();
|
final List<BlockChange> blockchanges = new ArrayList<>();
|
||||||
while (rs.next()) {
|
while (rs.next()) {
|
||||||
blockchanges.add(new BlockChange(rs, params));
|
blockchanges.add(new BlockChange(rs, params));
|
||||||
}
|
}
|
||||||
return blockchanges;
|
return blockchanges;
|
||||||
} finally {
|
} finally {
|
||||||
if (state != null) {
|
if (state != null) {
|
||||||
state.close();
|
state.close();
|
||||||
}
|
}
|
||||||
conn.close();
|
conn.close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getCount(QueryParams params) throws SQLException {
|
public int getCount(QueryParams params) throws SQLException {
|
||||||
if (params == null || params.world == null || !Config.isLogged(params.world)) {
|
if (params == null || params.world == null || !Config.isLogged(params.world)) {
|
||||||
throw new IllegalArgumentException("World is not logged: " + ((params == null || params.world == null) ? "null" : params.world.getName()));
|
throw new IllegalArgumentException("World is not logged: " + ((params == null || params.world == null) ? "null" : params.world.getName()));
|
||||||
}
|
}
|
||||||
final Connection conn = getConnection();
|
final Connection conn = getConnection();
|
||||||
Statement state = null;
|
Statement state = null;
|
||||||
if (conn == null) {
|
if (conn == null) {
|
||||||
throw new SQLException("No connection");
|
throw new SQLException("No connection");
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
state = conn.createStatement();
|
state = conn.createStatement();
|
||||||
final QueryParams p = params.clone();
|
final QueryParams p = params.clone();
|
||||||
p.needCount = true;
|
p.needCount = true;
|
||||||
final ResultSet rs = state.executeQuery(p.getQuery());
|
final ResultSet rs = state.executeQuery(p.getQuery());
|
||||||
if (!rs.next()) {
|
if (!rs.next()) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
return rs.getInt(1);
|
return rs.getInt(1);
|
||||||
} finally {
|
} finally {
|
||||||
if (state != null) {
|
if (state != null) {
|
||||||
state.close();
|
state.close();
|
||||||
}
|
}
|
||||||
conn.close();
|
conn.close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public File getFile() {
|
public File getFile() {
|
||||||
return super.getFile();
|
return super.getFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
public Questioner getQuestioner() {
|
public Questioner getQuestioner() {
|
||||||
return questioner;
|
return questioner;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ScaffoldingLogging getScaffoldingLogging() {
|
public ScaffoldingLogging getScaffoldingLogging() {
|
||||||
return scaffoldingLogging;
|
return scaffoldingLogging;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,18 +1,18 @@
|
|||||||
package de.diddiz.LogBlock;
|
package de.diddiz.LogBlock;
|
||||||
|
|
||||||
import net.md_5.bungee.api.chat.BaseComponent;
|
import net.md_5.bungee.api.chat.BaseComponent;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
|
|
||||||
public interface LookupCacheElement {
|
public interface LookupCacheElement {
|
||||||
public Location getLocation();
|
public Location getLocation();
|
||||||
|
|
||||||
public default BaseComponent[] getLogMessage() {
|
public default BaseComponent[] getLogMessage() {
|
||||||
return getLogMessage(-1);
|
return getLogMessage(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
public BaseComponent[] getLogMessage(int entry);
|
public BaseComponent[] getLogMessage(int entry);
|
||||||
|
|
||||||
public default int getNumChanges() {
|
public default int getNumChanges() {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,40 +1,40 @@
|
|||||||
package de.diddiz.LogBlock;
|
package de.diddiz.LogBlock;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.QueryParams.BlockChangeType;
|
import de.diddiz.LogBlock.QueryParams.BlockChangeType;
|
||||||
import de.diddiz.LogBlock.QueryParams.SummarizationMode;
|
import de.diddiz.LogBlock.QueryParams.SummarizationMode;
|
||||||
|
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
|
|
||||||
public class LookupCacheElementFactory {
|
public class LookupCacheElementFactory {
|
||||||
private final QueryParams params;
|
private final QueryParams params;
|
||||||
private final float spaceFactor;
|
private final float spaceFactor;
|
||||||
|
|
||||||
public LookupCacheElementFactory(QueryParams params, float spaceFactor) {
|
public LookupCacheElementFactory(QueryParams params, float spaceFactor) {
|
||||||
this.params = params;
|
this.params = params;
|
||||||
this.spaceFactor = spaceFactor;
|
this.spaceFactor = spaceFactor;
|
||||||
}
|
}
|
||||||
|
|
||||||
public LookupCacheElement getLookupCacheElement(ResultSet rs) throws SQLException {
|
public LookupCacheElement getLookupCacheElement(ResultSet rs) throws SQLException {
|
||||||
if (params.bct == BlockChangeType.CHAT) {
|
if (params.bct == BlockChangeType.CHAT) {
|
||||||
return new ChatMessage(rs, params);
|
return new ChatMessage(rs, params);
|
||||||
}
|
}
|
||||||
if (params.bct == BlockChangeType.KILLS) {
|
if (params.bct == BlockChangeType.KILLS) {
|
||||||
if (params.sum == SummarizationMode.NONE) {
|
if (params.sum == SummarizationMode.NONE) {
|
||||||
return new Kill(rs, params);
|
return new Kill(rs, params);
|
||||||
} else if (params.sum == SummarizationMode.PLAYERS) {
|
} else if (params.sum == SummarizationMode.PLAYERS) {
|
||||||
return new SummedKills(rs, params, spaceFactor);
|
return new SummedKills(rs, params, spaceFactor);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (params.bct == BlockChangeType.ENTITIES || params.bct == BlockChangeType.ENTITIES_CREATED || params.bct == BlockChangeType.ENTITIES_KILLED) {
|
if (params.bct == BlockChangeType.ENTITIES || params.bct == BlockChangeType.ENTITIES_CREATED || params.bct == BlockChangeType.ENTITIES_KILLED) {
|
||||||
if (params.sum == SummarizationMode.NONE) {
|
if (params.sum == SummarizationMode.NONE) {
|
||||||
return new EntityChange(rs, params);
|
return new EntityChange(rs, params);
|
||||||
}
|
}
|
||||||
return new SummedEntityChanges(rs, params, spaceFactor);
|
return new SummedEntityChanges(rs, params, spaceFactor);
|
||||||
}
|
}
|
||||||
if (params.sum == SummarizationMode.NONE) {
|
if (params.sum == SummarizationMode.NONE) {
|
||||||
return new BlockChange(rs, params);
|
return new BlockChange(rs, params);
|
||||||
}
|
}
|
||||||
return new SummedBlockChanges(rs, params, spaceFactor);
|
return new SummedBlockChanges(rs, params, spaceFactor);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,49 +1,49 @@
|
|||||||
package de.diddiz.LogBlock;
|
package de.diddiz.LogBlock;
|
||||||
|
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.toolsByType;
|
import static de.diddiz.LogBlock.config.Config.toolsByType;
|
||||||
import static org.bukkit.Bukkit.getServer;
|
import static org.bukkit.Bukkit.getServer;
|
||||||
|
|
||||||
public class Session {
|
public class Session {
|
||||||
private static final Map<String, Session> sessions = new HashMap<>();
|
private static final Map<String, Session> sessions = new HashMap<>();
|
||||||
public QueryParams lastQuery = null;
|
public QueryParams lastQuery = null;
|
||||||
public LookupCacheElement[] lookupCache = null;
|
public LookupCacheElement[] lookupCache = null;
|
||||||
public int page = 1;
|
public int page = 1;
|
||||||
public Map<Tool, ToolData> toolData;
|
public Map<Tool, ToolData> toolData;
|
||||||
|
|
||||||
private Session(Player player) {
|
private Session(Player player) {
|
||||||
toolData = new HashMap<>();
|
toolData = new HashMap<>();
|
||||||
final LogBlock logblock = LogBlock.getInstance();
|
final LogBlock logblock = LogBlock.getInstance();
|
||||||
if (player != null) {
|
if (player != null) {
|
||||||
for (final Tool tool : toolsByType.values()) {
|
for (final Tool tool : toolsByType.values()) {
|
||||||
toolData.put(tool, new ToolData(tool, logblock, player));
|
toolData.put(tool, new ToolData(tool, logblock, player));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean hasSession(CommandSender sender) {
|
public static boolean hasSession(CommandSender sender) {
|
||||||
return sessions.containsKey(sender.getName().toLowerCase());
|
return sessions.containsKey(sender.getName().toLowerCase());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean hasSession(String playerName) {
|
public static boolean hasSession(String playerName) {
|
||||||
return sessions.containsKey(playerName.toLowerCase());
|
return sessions.containsKey(playerName.toLowerCase());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Session getSession(CommandSender sender) {
|
public static Session getSession(CommandSender sender) {
|
||||||
return getSession(sender.getName());
|
return getSession(sender.getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Session getSession(String playerName) {
|
public static Session getSession(String playerName) {
|
||||||
Session session = sessions.get(playerName.toLowerCase());
|
Session session = sessions.get(playerName.toLowerCase());
|
||||||
if (session == null) {
|
if (session == null) {
|
||||||
session = new Session(getServer().getPlayer(playerName));
|
session = new Session(getServer().getPlayer(playerName));
|
||||||
sessions.put(playerName.toLowerCase(), session);
|
sessions.put(playerName.toLowerCase(), session);
|
||||||
}
|
}
|
||||||
return session;
|
return session;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,43 +1,43 @@
|
|||||||
package de.diddiz.LogBlock;
|
package de.diddiz.LogBlock;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial;
|
import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.QueryParams.SummarizationMode;
|
import de.diddiz.LogBlock.QueryParams.SummarizationMode;
|
||||||
import de.diddiz.LogBlock.util.MessagingUtil;
|
import de.diddiz.LogBlock.util.MessagingUtil;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import net.md_5.bungee.api.chat.BaseComponent;
|
import net.md_5.bungee.api.chat.BaseComponent;
|
||||||
import net.md_5.bungee.api.chat.TextComponent;
|
import net.md_5.bungee.api.chat.TextComponent;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
|
|
||||||
public class SummedBlockChanges implements LookupCacheElement {
|
public class SummedBlockChanges implements LookupCacheElement {
|
||||||
private final int type;
|
private final int type;
|
||||||
private final int created, destroyed;
|
private final int created, destroyed;
|
||||||
private final float spaceFactor;
|
private final float spaceFactor;
|
||||||
private final Actor actor;
|
private final Actor actor;
|
||||||
|
|
||||||
public SummedBlockChanges(ResultSet rs, QueryParams p, float spaceFactor) throws SQLException {
|
public SummedBlockChanges(ResultSet rs, QueryParams p, float spaceFactor) throws SQLException {
|
||||||
// Actor currently useless here as we don't yet output UUID in results anywhere
|
// Actor currently useless here as we don't yet output UUID in results anywhere
|
||||||
actor = p.sum == SummarizationMode.PLAYERS ? new Actor(rs) : null;
|
actor = p.sum == SummarizationMode.PLAYERS ? new Actor(rs) : null;
|
||||||
type = p.sum == SummarizationMode.TYPES ? rs.getInt("type") : 0;
|
type = p.sum == SummarizationMode.TYPES ? rs.getInt("type") : 0;
|
||||||
created = rs.getInt("created");
|
created = rs.getInt("created");
|
||||||
destroyed = rs.getInt("destroyed");
|
destroyed = rs.getInt("destroyed");
|
||||||
this.spaceFactor = spaceFactor;
|
this.spaceFactor = spaceFactor;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Location getLocation() {
|
public Location getLocation() {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseComponent[] getLogMessage(int entry) {
|
public BaseComponent[] getLogMessage(int entry) {
|
||||||
return MessagingUtil.formatSummarizedChanges(created, destroyed, actor != null ? new TextComponent(actor.getName()) : prettyMaterial(Objects.toString(MaterialConverter.getMaterial(type))), 10, 10, spaceFactor);
|
return MessagingUtil.formatSummarizedChanges(created, destroyed, actor != null ? new TextComponent(actor.getName()) : prettyMaterial(Objects.toString(MaterialConverter.getMaterial(type))), 10, 10, spaceFactor);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getNumChanges() {
|
public int getNumChanges() {
|
||||||
return created + destroyed;
|
return created + destroyed;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,35 +1,35 @@
|
|||||||
package de.diddiz.LogBlock;
|
package de.diddiz.LogBlock;
|
||||||
|
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.permissions.PermissionDefault;
|
import org.bukkit.permissions.PermissionDefault;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class Tool {
|
public class Tool {
|
||||||
public final String name;
|
public final String name;
|
||||||
public final List<String> aliases;
|
public final List<String> aliases;
|
||||||
public final ToolBehavior leftClickBehavior, rightClickBehavior;
|
public final ToolBehavior leftClickBehavior, rightClickBehavior;
|
||||||
public final boolean defaultEnabled;
|
public final boolean defaultEnabled;
|
||||||
public final Material item;
|
public final Material item;
|
||||||
public final boolean canDrop;
|
public final boolean canDrop;
|
||||||
public final QueryParams params;
|
public final QueryParams params;
|
||||||
public final ToolMode mode;
|
public final ToolMode mode;
|
||||||
public final PermissionDefault permissionDefault;
|
public final PermissionDefault permissionDefault;
|
||||||
public final boolean removeOnDisable;
|
public final boolean removeOnDisable;
|
||||||
public final boolean dropToDisable;
|
public final boolean dropToDisable;
|
||||||
|
|
||||||
public Tool(String name, List<String> aliases, ToolBehavior leftClickBehavior, ToolBehavior rightClickBehavior, boolean defaultEnabled, Material item, boolean canDrop, QueryParams params, ToolMode mode, PermissionDefault permissionDefault, boolean removeOnDisable, boolean dropToDisable) {
|
public Tool(String name, List<String> aliases, ToolBehavior leftClickBehavior, ToolBehavior rightClickBehavior, boolean defaultEnabled, Material item, boolean canDrop, QueryParams params, ToolMode mode, PermissionDefault permissionDefault, boolean removeOnDisable, boolean dropToDisable) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.aliases = aliases;
|
this.aliases = aliases;
|
||||||
this.leftClickBehavior = leftClickBehavior;
|
this.leftClickBehavior = leftClickBehavior;
|
||||||
this.rightClickBehavior = rightClickBehavior;
|
this.rightClickBehavior = rightClickBehavior;
|
||||||
this.defaultEnabled = defaultEnabled;
|
this.defaultEnabled = defaultEnabled;
|
||||||
this.item = item;
|
this.item = item;
|
||||||
this.canDrop = canDrop;
|
this.canDrop = canDrop;
|
||||||
this.params = params;
|
this.params = params;
|
||||||
this.mode = mode;
|
this.mode = mode;
|
||||||
this.permissionDefault = permissionDefault;
|
this.permissionDefault = permissionDefault;
|
||||||
this.removeOnDisable = removeOnDisable;
|
this.removeOnDisable = removeOnDisable;
|
||||||
this.dropToDisable = dropToDisable;
|
this.dropToDisable = dropToDisable;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
package de.diddiz.LogBlock;
|
package de.diddiz.LogBlock;
|
||||||
|
|
||||||
public enum ToolBehavior {
|
public enum ToolBehavior {
|
||||||
TOOL,
|
TOOL,
|
||||||
BLOCK,
|
BLOCK,
|
||||||
NONE
|
NONE
|
||||||
}
|
}
|
||||||
|
@ -1,15 +1,15 @@
|
|||||||
package de.diddiz.LogBlock;
|
package de.diddiz.LogBlock;
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
public class ToolData {
|
public class ToolData {
|
||||||
public boolean enabled;
|
public boolean enabled;
|
||||||
public QueryParams params;
|
public QueryParams params;
|
||||||
public ToolMode mode;
|
public ToolMode mode;
|
||||||
|
|
||||||
public ToolData(Tool tool, LogBlock logblock, Player player) {
|
public ToolData(Tool tool, LogBlock logblock, Player player) {
|
||||||
enabled = tool.defaultEnabled && logblock.hasPermission(player, "logblock.tools." + tool.name);
|
enabled = tool.defaultEnabled && logblock.hasPermission(player, "logblock.tools." + tool.name);
|
||||||
params = tool.params.clone();
|
params = tool.params.clone();
|
||||||
mode = tool.mode;
|
mode = tool.mode;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,18 +1,18 @@
|
|||||||
package de.diddiz.LogBlock;
|
package de.diddiz.LogBlock;
|
||||||
|
|
||||||
public enum ToolMode {
|
public enum ToolMode {
|
||||||
CLEARLOG("logblock.clearlog"),
|
CLEARLOG("logblock.clearlog"),
|
||||||
LOOKUP("logblock.lookup"),
|
LOOKUP("logblock.lookup"),
|
||||||
REDO("logblock.rollback"),
|
REDO("logblock.rollback"),
|
||||||
ROLLBACK("logblock.rollback"),
|
ROLLBACK("logblock.rollback"),
|
||||||
WRITELOGFILE("logblock.rollback");
|
WRITELOGFILE("logblock.rollback");
|
||||||
private final String permission;
|
private final String permission;
|
||||||
|
|
||||||
private ToolMode(String permission) {
|
private ToolMode(String permission) {
|
||||||
this.permission = permission;
|
this.permission = permission;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getPermission() {
|
public String getPermission() {
|
||||||
return permission;
|
return permission;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,171 +1,171 @@
|
|||||||
package de.diddiz.LogBlock.config;
|
package de.diddiz.LogBlock.config;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import de.diddiz.LogBlock.Logging;
|
import de.diddiz.LogBlock.Logging;
|
||||||
import de.diddiz.LogBlock.util.BukkitUtils;
|
import de.diddiz.LogBlock.util.BukkitUtils;
|
||||||
import org.bukkit.configuration.file.YamlConfiguration;
|
import org.bukkit.configuration.file.YamlConfiguration;
|
||||||
import org.bukkit.entity.Animals;
|
import org.bukkit.entity.Animals;
|
||||||
import org.bukkit.entity.ArmorStand;
|
import org.bukkit.entity.ArmorStand;
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
import org.bukkit.entity.EntityType;
|
import org.bukkit.entity.EntityType;
|
||||||
import org.bukkit.entity.LivingEntity;
|
import org.bukkit.entity.LivingEntity;
|
||||||
import org.bukkit.entity.Monster;
|
import org.bukkit.entity.Monster;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.entity.WaterMob;
|
import org.bukkit.entity.WaterMob;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.EnumMap;
|
import java.util.EnumMap;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
public class WorldConfig extends LoggingEnabledMapping {
|
public class WorldConfig extends LoggingEnabledMapping {
|
||||||
public final String world;
|
public final String world;
|
||||||
public final String table;
|
public final String table;
|
||||||
public final String insertBlockStatementString;
|
public final String insertBlockStatementString;
|
||||||
public final String selectBlockActorIdStatementString;
|
public final String selectBlockActorIdStatementString;
|
||||||
public final String insertBlockStateStatementString;
|
public final String insertBlockStateStatementString;
|
||||||
public final String insertBlockChestDataStatementString;
|
public final String insertBlockChestDataStatementString;
|
||||||
public final String insertEntityStatementString;
|
public final String insertEntityStatementString;
|
||||||
public final String updateEntityUUIDString;
|
public final String updateEntityUUIDString;
|
||||||
|
|
||||||
private final EnumMap<EntityLogging, EntityLoggingList> entityLogging = new EnumMap<>(EntityLogging.class);
|
private final EnumMap<EntityLogging, EntityLoggingList> entityLogging = new EnumMap<>(EntityLogging.class);
|
||||||
public final boolean logNaturalEntitySpawns;
|
public final boolean logNaturalEntitySpawns;
|
||||||
public final boolean logAllNamedEntityKills;
|
public final boolean logAllNamedEntityKills;
|
||||||
|
|
||||||
public WorldConfig(String world, File file) throws IOException {
|
public WorldConfig(String world, File file) throws IOException {
|
||||||
this.world = world;
|
this.world = world;
|
||||||
final Map<String, Object> def = new HashMap<>();
|
final Map<String, Object> def = new HashMap<>();
|
||||||
// "Before MySQL 5.1.6, database and table names cannot contain "/", "\", ".", or characters that are not permitted in file names" - MySQL manual
|
// "Before MySQL 5.1.6, database and table names cannot contain "/", "\", ".", or characters that are not permitted in file names" - MySQL manual
|
||||||
// They _can_ contain spaces, but replace them as well
|
// They _can_ contain spaces, but replace them as well
|
||||||
def.put("table", "lb-" + file.getName().substring(0, file.getName().length() - 4).replaceAll("[ ./\\\\]", "_"));
|
def.put("table", "lb-" + file.getName().substring(0, file.getName().length() - 4).replaceAll("[ ./\\\\]", "_"));
|
||||||
for (final Logging l : Logging.values()) {
|
for (final Logging l : Logging.values()) {
|
||||||
def.put("logging." + l.toString(), l.isDefaultEnabled());
|
def.put("logging." + l.toString(), l.isDefaultEnabled());
|
||||||
}
|
}
|
||||||
final YamlConfiguration config = YamlConfiguration.loadConfiguration(file);
|
final YamlConfiguration config = YamlConfiguration.loadConfiguration(file);
|
||||||
for (final Entry<String, Object> e : def.entrySet()) {
|
for (final Entry<String, Object> e : def.entrySet()) {
|
||||||
if (config.get(e.getKey()) == null) {
|
if (config.get(e.getKey()) == null) {
|
||||||
config.set(e.getKey(), e.getValue());
|
config.set(e.getKey(), e.getValue());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (EntityLogging el : EntityLogging.values()) {
|
for (EntityLogging el : EntityLogging.values()) {
|
||||||
if (!(config.get("entity." + el.name().toLowerCase()) instanceof List)) {
|
if (!(config.get("entity." + el.name().toLowerCase()) instanceof List)) {
|
||||||
config.set("entity." + el.name().toLowerCase(), el.getDefaultEnabled());
|
config.set("entity." + el.name().toLowerCase(), el.getDefaultEnabled());
|
||||||
}
|
}
|
||||||
entityLogging.put(el, new EntityLoggingList(el, config.getStringList("entity." + el.name().toLowerCase())));
|
entityLogging.put(el, new EntityLoggingList(el, config.getStringList("entity." + el.name().toLowerCase())));
|
||||||
}
|
}
|
||||||
if (!config.isBoolean("entity.logNaturalSpawns")) {
|
if (!config.isBoolean("entity.logNaturalSpawns")) {
|
||||||
config.set("entity.logNaturalSpawns", false);
|
config.set("entity.logNaturalSpawns", false);
|
||||||
}
|
}
|
||||||
logNaturalEntitySpawns = config.getBoolean("entity.logNaturalSpawns");
|
logNaturalEntitySpawns = config.getBoolean("entity.logNaturalSpawns");
|
||||||
|
|
||||||
if (!config.isBoolean("entity.logAllNamedEntityKills")) {
|
if (!config.isBoolean("entity.logAllNamedEntityKills")) {
|
||||||
config.set("entity.logAllNamedEntityKills", true);
|
config.set("entity.logAllNamedEntityKills", true);
|
||||||
}
|
}
|
||||||
logAllNamedEntityKills = config.getBoolean("entity.logAllNamedEntityKills");
|
logAllNamedEntityKills = config.getBoolean("entity.logAllNamedEntityKills");
|
||||||
|
|
||||||
config.save(file);
|
config.save(file);
|
||||||
table = config.getString("table");
|
table = config.getString("table");
|
||||||
for (final Logging l : Logging.values()) {
|
for (final Logging l : Logging.values()) {
|
||||||
setLogging(l, config.getBoolean("logging." + l.toString()));
|
setLogging(l, config.getBoolean("logging." + l.toString()));
|
||||||
}
|
}
|
||||||
|
|
||||||
insertBlockStatementString = "INSERT INTO `" + table + "-blocks` (date, playerid, replaced, replaceddata, type, typedata, x, y, z) VALUES (FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?)";
|
insertBlockStatementString = "INSERT INTO `" + table + "-blocks` (date, playerid, replaced, replaceddata, type, typedata, x, y, z) VALUES (FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?)";
|
||||||
selectBlockActorIdStatementString = "SELECT playerid FROM `" + table + "-blocks` WHERE x = ? AND y = ? AND z = ? ORDER BY date DESC LIMIT 1";
|
selectBlockActorIdStatementString = "SELECT playerid FROM `" + table + "-blocks` WHERE x = ? AND y = ? AND z = ? ORDER BY date DESC LIMIT 1";
|
||||||
insertBlockStateStatementString = "INSERT INTO `" + table + "-state` (replacedState, typeState, id) VALUES(?, ?, ?)";
|
insertBlockStateStatementString = "INSERT INTO `" + table + "-state` (replacedState, typeState, id) VALUES(?, ?, ?)";
|
||||||
insertBlockChestDataStatementString = "INSERT INTO `" + table + "-chestdata` (item, itemremove, id, itemtype) values (?, ?, ?, ?)";
|
insertBlockChestDataStatementString = "INSERT INTO `" + table + "-chestdata` (item, itemremove, id, itemtype) values (?, ?, ?, ?)";
|
||||||
insertEntityStatementString = "INSERT INTO `" + table + "-entities` (date, playerid, entityid, entitytypeid, x, y, z, action, data) VALUES (FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?)";
|
insertEntityStatementString = "INSERT INTO `" + table + "-entities` (date, playerid, entityid, entitytypeid, x, y, z, action, data) VALUES (FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?)";
|
||||||
updateEntityUUIDString = "UPDATE `" + table + "-entityids` SET entityuuid = ? WHERE entityid = ?";
|
updateEntityUUIDString = "UPDATE `" + table + "-entityids` SET entityuuid = ? WHERE entityid = ?";
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isLogging(EntityLogging logging, Entity entity) {
|
public boolean isLogging(EntityLogging logging, Entity entity) {
|
||||||
return entityLogging.get(logging).isLogging(entity);
|
return entityLogging.get(logging).isLogging(entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isLoggingAnyEntities() {
|
public boolean isLoggingAnyEntities() {
|
||||||
for (EntityLoggingList list : entityLogging.values()) {
|
for (EntityLoggingList list : entityLogging.values()) {
|
||||||
if (list.isLoggingAnyEntities()) {
|
if (list.isLoggingAnyEntities()) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private class EntityLoggingList {
|
private class EntityLoggingList {
|
||||||
private final EntityLogging entityAction;
|
private final EntityLogging entityAction;
|
||||||
private final HashSet<EntityType> logged = new HashSet<>();
|
private final HashSet<EntityType> logged = new HashSet<>();
|
||||||
private final boolean logAll;
|
private final boolean logAll;
|
||||||
private final boolean logAnimals;
|
private final boolean logAnimals;
|
||||||
private final boolean logWateranimals;
|
private final boolean logWateranimals;
|
||||||
private final boolean logMonsters;
|
private final boolean logMonsters;
|
||||||
private final boolean logLiving;
|
private final boolean logLiving;
|
||||||
|
|
||||||
public EntityLoggingList(EntityLogging entityAction, List<String> types) {
|
public EntityLoggingList(EntityLogging entityAction, List<String> types) {
|
||||||
this.entityAction = entityAction;
|
this.entityAction = entityAction;
|
||||||
boolean all = false;
|
boolean all = false;
|
||||||
boolean animals = false;
|
boolean animals = false;
|
||||||
boolean wateranimals = false;
|
boolean wateranimals = false;
|
||||||
boolean monsters = false;
|
boolean monsters = false;
|
||||||
boolean living = false;
|
boolean living = false;
|
||||||
for (String type : types) {
|
for (String type : types) {
|
||||||
EntityType et = BukkitUtils.matchEntityType(type);
|
EntityType et = BukkitUtils.matchEntityType(type);
|
||||||
if (et != null) {
|
if (et != null) {
|
||||||
logged.add(et);
|
logged.add(et);
|
||||||
} else {
|
} else {
|
||||||
if (type.equalsIgnoreCase("all")) {
|
if (type.equalsIgnoreCase("all")) {
|
||||||
all = true;
|
all = true;
|
||||||
} else if (type.equalsIgnoreCase("animal") || type.equalsIgnoreCase("animals")) {
|
} else if (type.equalsIgnoreCase("animal") || type.equalsIgnoreCase("animals")) {
|
||||||
animals = true;
|
animals = true;
|
||||||
} else if (type.equalsIgnoreCase("wateranimal") || type.equalsIgnoreCase("wateranimals")) {
|
} else if (type.equalsIgnoreCase("wateranimal") || type.equalsIgnoreCase("wateranimals")) {
|
||||||
wateranimals = true;
|
wateranimals = true;
|
||||||
} else if (type.equalsIgnoreCase("monster") || type.equalsIgnoreCase("monsters")) {
|
} else if (type.equalsIgnoreCase("monster") || type.equalsIgnoreCase("monsters")) {
|
||||||
monsters = true;
|
monsters = true;
|
||||||
} else if (type.equalsIgnoreCase("living")) {
|
} else if (type.equalsIgnoreCase("living")) {
|
||||||
living = true;
|
living = true;
|
||||||
} else {
|
} else {
|
||||||
LogBlock.getInstance().getLogger().log(Level.WARNING, "Unkown entity type in config for " + world + ": " + type);
|
LogBlock.getInstance().getLogger().log(Level.WARNING, "Unkown entity type in config for " + world + ": " + type);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
logAll = all;
|
logAll = all;
|
||||||
logAnimals = animals;
|
logAnimals = animals;
|
||||||
logWateranimals = wateranimals;
|
logWateranimals = wateranimals;
|
||||||
logMonsters = monsters;
|
logMonsters = monsters;
|
||||||
logLiving = living;
|
logLiving = living;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isLogging(Entity entity) {
|
public boolean isLogging(Entity entity) {
|
||||||
if (entity == null || (entity instanceof Player)) {
|
if (entity == null || (entity instanceof Player)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
EntityType type = entity.getType();
|
EntityType type = entity.getType();
|
||||||
if (logAll || logged.contains(type)) {
|
if (logAll || logged.contains(type)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (logLiving && LivingEntity.class.isAssignableFrom(entity.getClass()) && !(entity instanceof ArmorStand)) {
|
if (logLiving && LivingEntity.class.isAssignableFrom(entity.getClass()) && !(entity instanceof ArmorStand)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (logAnimals && Animals.class.isAssignableFrom(entity.getClass())) {
|
if (logAnimals && Animals.class.isAssignableFrom(entity.getClass())) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (logWateranimals && WaterMob.class.isAssignableFrom(entity.getClass())) {
|
if (logWateranimals && WaterMob.class.isAssignableFrom(entity.getClass())) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (logMonsters && (Monster.class.isAssignableFrom(entity.getClass()) || entity.getType() == EntityType.SLIME || entity.getType() == EntityType.WITHER || entity.getType() == EntityType.ENDER_DRAGON || entity.getType() == EntityType.SHULKER || entity.getType() == EntityType.GHAST)) {
|
if (logMonsters && (Monster.class.isAssignableFrom(entity.getClass()) || entity.getType() == EntityType.SLIME || entity.getType() == EntityType.WITHER || entity.getType() == EntityType.ENDER_DRAGON || entity.getType() == EntityType.SHULKER || entity.getType() == EntityType.GHAST)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (entityAction == EntityLogging.DESTROY && logAllNamedEntityKills && entity.getCustomName() != null) {
|
if (entityAction == EntityLogging.DESTROY && logAllNamedEntityKills && entity.getCustomName() != null) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isLoggingAnyEntities() {
|
public boolean isLoggingAnyEntities() {
|
||||||
return logAll || logAnimals || logLiving || logMonsters || !logged.isEmpty() || (entityAction == EntityLogging.DESTROY && logAllNamedEntityKills);
|
return logAll || logAnimals || logLiving || logMonsters || !logged.isEmpty() || (entityAction == EntityLogging.DESTROY && logAllNamedEntityKills);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,48 +1,48 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.CommandsHandler;
|
import de.diddiz.LogBlock.CommandsHandler;
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import de.diddiz.LogBlock.QueryParams;
|
import de.diddiz.LogBlock.QueryParams;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
|
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.banPermission;
|
import static de.diddiz.LogBlock.config.Config.banPermission;
|
||||||
import static de.diddiz.LogBlock.config.Config.isLogged;
|
import static de.diddiz.LogBlock.config.Config.isLogged;
|
||||||
import static org.bukkit.Bukkit.getScheduler;
|
import static org.bukkit.Bukkit.getScheduler;
|
||||||
|
|
||||||
public class BanListener implements Listener {
|
public class BanListener implements Listener {
|
||||||
private final CommandsHandler handler;
|
private final CommandsHandler handler;
|
||||||
private final LogBlock logblock;
|
private final LogBlock logblock;
|
||||||
|
|
||||||
public BanListener(LogBlock logblock) {
|
public BanListener(LogBlock logblock) {
|
||||||
this.logblock = logblock;
|
this.logblock = logblock;
|
||||||
handler = logblock.getCommandsHandler();
|
handler = logblock.getCommandsHandler();
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event) {
|
public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event) {
|
||||||
final String[] split = event.getMessage().split(" ");
|
final String[] split = event.getMessage().split(" ");
|
||||||
if (split.length > 1 && split[0].equalsIgnoreCase("/ban") && logblock.hasPermission(event.getPlayer(), banPermission)) {
|
if (split.length > 1 && split[0].equalsIgnoreCase("/ban") && logblock.hasPermission(event.getPlayer(), banPermission)) {
|
||||||
final QueryParams p = new QueryParams(logblock);
|
final QueryParams p = new QueryParams(logblock);
|
||||||
p.setPlayer(split[1].equalsIgnoreCase("g") ? split[2] : split[1]);
|
p.setPlayer(split[1].equalsIgnoreCase("g") ? split[2] : split[1]);
|
||||||
p.since = 0;
|
p.since = 0;
|
||||||
p.silent = false;
|
p.silent = false;
|
||||||
getScheduler().runTaskAsynchronously(logblock, new Runnable() {
|
getScheduler().runTaskAsynchronously(logblock, new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
for (final World world : logblock.getServer().getWorlds()) {
|
for (final World world : logblock.getServer().getWorlds()) {
|
||||||
if (isLogged(world)) {
|
if (isLogged(world)) {
|
||||||
p.world = world;
|
p.world = world;
|
||||||
try {
|
try {
|
||||||
handler.new CommandRollback(event.getPlayer(), p, false);
|
handler.new CommandRollback(event.getPlayer(), p, false);
|
||||||
} catch (final Exception ex) {
|
} catch (final Exception ex) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,74 +1,74 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.Actor;
|
import de.diddiz.LogBlock.Actor;
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import de.diddiz.LogBlock.Logging;
|
import de.diddiz.LogBlock.Logging;
|
||||||
import de.diddiz.LogBlock.config.WorldConfig;
|
import de.diddiz.LogBlock.config.WorldConfig;
|
||||||
import de.diddiz.LogBlock.util.BukkitUtils;
|
import de.diddiz.LogBlock.util.BukkitUtils;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.GameMode;
|
import org.bukkit.GameMode;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
import org.bukkit.block.data.Waterlogged;
|
import org.bukkit.block.data.Waterlogged;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.block.BlockBreakEvent;
|
import org.bukkit.event.block.BlockBreakEvent;
|
||||||
import org.bukkit.event.player.PlayerBucketFillEvent;
|
import org.bukkit.event.player.PlayerBucketFillEvent;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.getWorldConfig;
|
import static de.diddiz.LogBlock.config.Config.getWorldConfig;
|
||||||
import static de.diddiz.LogBlock.config.Config.isLogging;
|
import static de.diddiz.LogBlock.config.Config.isLogging;
|
||||||
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockBreak;
|
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockBreak;
|
||||||
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockReplace;
|
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockReplace;
|
||||||
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogFallables;
|
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogFallables;
|
||||||
|
|
||||||
public class BlockBreakLogging extends LoggingListener {
|
public class BlockBreakLogging extends LoggingListener {
|
||||||
public BlockBreakLogging(LogBlock lb) {
|
public BlockBreakLogging(LogBlock lb) {
|
||||||
super(lb);
|
super(lb);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onBlockBreak(BlockBreakEvent event) {
|
public void onBlockBreak(BlockBreakEvent event) {
|
||||||
if (isLogging(event.getBlock().getWorld(), Logging.BLOCKBREAK)) {
|
if (isLogging(event.getBlock().getWorld(), Logging.BLOCKBREAK)) {
|
||||||
WorldConfig wcfg = getWorldConfig(event.getBlock().getWorld());
|
WorldConfig wcfg = getWorldConfig(event.getBlock().getWorld());
|
||||||
if (wcfg == null) {
|
if (wcfg == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
final Actor actor = Actor.actorFromEntity(event.getPlayer());
|
final Actor actor = Actor.actorFromEntity(event.getPlayer());
|
||||||
final Block origin = event.getBlock();
|
final Block origin = event.getBlock();
|
||||||
final Material type = origin.getType();
|
final Material type = origin.getType();
|
||||||
|
|
||||||
if (wcfg.isLogging(Logging.CHESTACCESS) && BukkitUtils.getContainerBlocks().contains(type) && !BukkitUtils.getShulkerBoxBlocks().contains(type)) {
|
if (wcfg.isLogging(Logging.CHESTACCESS) && BukkitUtils.getContainerBlocks().contains(type) && !BukkitUtils.getShulkerBoxBlocks().contains(type)) {
|
||||||
consumer.queueContainerBreak(actor, origin.getState());
|
consumer.queueContainerBreak(actor, origin.getState());
|
||||||
} else if (type == Material.ICE) {
|
} else if (type == Material.ICE) {
|
||||||
// When in creative mode ice doesn't form water
|
// When in creative mode ice doesn't form water
|
||||||
if (event.getPlayer().getGameMode().equals(GameMode.CREATIVE)) {
|
if (event.getPlayer().getGameMode().equals(GameMode.CREATIVE)) {
|
||||||
smartLogBlockBreak(consumer, actor, origin);
|
smartLogBlockBreak(consumer, actor, origin);
|
||||||
} else {
|
} else {
|
||||||
smartLogBlockReplace(consumer, actor, origin, Bukkit.createBlockData(Material.WATER));
|
smartLogBlockReplace(consumer, actor, origin, Bukkit.createBlockData(Material.WATER));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
smartLogBlockBreak(consumer, actor, origin);
|
smartLogBlockBreak(consumer, actor, origin);
|
||||||
}
|
}
|
||||||
smartLogFallables(consumer, actor, origin);
|
smartLogFallables(consumer, actor, origin);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onPlayerBucketFill(PlayerBucketFillEvent event) {
|
public void onPlayerBucketFill(PlayerBucketFillEvent event) {
|
||||||
if (isLogging(event.getBlockClicked().getWorld(), Logging.BLOCKBREAK)) {
|
if (isLogging(event.getBlockClicked().getWorld(), Logging.BLOCKBREAK)) {
|
||||||
BlockData clickedBlockData = event.getBlockClicked().getBlockData();
|
BlockData clickedBlockData = event.getBlockClicked().getBlockData();
|
||||||
if (clickedBlockData instanceof Waterlogged) {
|
if (clickedBlockData instanceof Waterlogged) {
|
||||||
Waterlogged clickedWaterlogged = (Waterlogged) clickedBlockData;
|
Waterlogged clickedWaterlogged = (Waterlogged) clickedBlockData;
|
||||||
if (clickedWaterlogged.isWaterlogged()) {
|
if (clickedWaterlogged.isWaterlogged()) {
|
||||||
Waterlogged clickedWaterloggedWithoutWater = (Waterlogged) clickedWaterlogged.clone();
|
Waterlogged clickedWaterloggedWithoutWater = (Waterlogged) clickedWaterlogged.clone();
|
||||||
clickedWaterloggedWithoutWater.setWaterlogged(false);
|
clickedWaterloggedWithoutWater.setWaterlogged(false);
|
||||||
consumer.queueBlockReplace(Actor.actorFromEntity(event.getPlayer()), event.getBlockClicked().getLocation(), clickedWaterlogged, clickedWaterloggedWithoutWater);
|
consumer.queueBlockReplace(Actor.actorFromEntity(event.getPlayer()), event.getBlockClicked().getLocation(), clickedWaterlogged, clickedWaterloggedWithoutWater);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
consumer.queueBlockBreak(Actor.actorFromEntity(event.getPlayer()), event.getBlockClicked().getState());
|
consumer.queueBlockBreak(Actor.actorFromEntity(event.getPlayer()), event.getBlockClicked().getState());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,72 +1,72 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.Actor;
|
import de.diddiz.LogBlock.Actor;
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import de.diddiz.LogBlock.Logging;
|
import de.diddiz.LogBlock.Logging;
|
||||||
import de.diddiz.LogBlock.config.Config;
|
import de.diddiz.LogBlock.config.Config;
|
||||||
|
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.block.Action;
|
import org.bukkit.event.block.Action;
|
||||||
import org.bukkit.event.block.BlockBurnEvent;
|
import org.bukkit.event.block.BlockBurnEvent;
|
||||||
import org.bukkit.event.block.BlockIgniteEvent;
|
import org.bukkit.event.block.BlockIgniteEvent;
|
||||||
import org.bukkit.event.block.BlockIgniteEvent.IgniteCause;
|
import org.bukkit.event.block.BlockIgniteEvent.IgniteCause;
|
||||||
import org.bukkit.event.player.PlayerInteractEvent;
|
import org.bukkit.event.player.PlayerInteractEvent;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.isLogging;
|
import static de.diddiz.LogBlock.config.Config.isLogging;
|
||||||
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockBreak;
|
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockBreak;
|
||||||
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockReplace;
|
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockReplace;
|
||||||
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogFallables;
|
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogFallables;
|
||||||
|
|
||||||
public class BlockBurnLogging extends LoggingListener {
|
public class BlockBurnLogging extends LoggingListener {
|
||||||
public BlockBurnLogging(LogBlock lb) {
|
public BlockBurnLogging(LogBlock lb) {
|
||||||
super(lb);
|
super(lb);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onBlockBurn(BlockBurnEvent event) {
|
public void onBlockBurn(BlockBurnEvent event) {
|
||||||
if (isLogging(event.getBlock().getWorld(), Logging.FIRE)) {
|
if (isLogging(event.getBlock().getWorld(), Logging.FIRE)) {
|
||||||
smartLogBlockReplace(consumer, new Actor("Fire", Config.logFireSpreadAsPlayerWhoCreatedIt ? event.getIgnitingBlock() : null), event.getBlock(), Material.FIRE.createBlockData());
|
smartLogBlockReplace(consumer, new Actor("Fire", Config.logFireSpreadAsPlayerWhoCreatedIt ? event.getIgnitingBlock() : null), event.getBlock(), Material.FIRE.createBlockData());
|
||||||
smartLogFallables(consumer, new Actor("Fire", Config.logFireSpreadAsPlayerWhoCreatedIt ? event.getIgnitingBlock() : null), event.getBlock());
|
smartLogFallables(consumer, new Actor("Fire", Config.logFireSpreadAsPlayerWhoCreatedIt ? event.getIgnitingBlock() : null), event.getBlock());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onBlockIgnite(BlockIgniteEvent event) {
|
public void onBlockIgnite(BlockIgniteEvent event) {
|
||||||
Actor actor = new Actor("Fire", Config.logFireSpreadAsPlayerWhoCreatedIt ? event.getIgnitingBlock() : null);
|
Actor actor = new Actor("Fire", Config.logFireSpreadAsPlayerWhoCreatedIt ? event.getIgnitingBlock() : null);
|
||||||
if (event.getCause() == IgniteCause.FLINT_AND_STEEL) {
|
if (event.getCause() == IgniteCause.FLINT_AND_STEEL) {
|
||||||
if (event.getIgnitingEntity() != null) {
|
if (event.getIgnitingEntity() != null) {
|
||||||
return; // handled in block place
|
return; // handled in block place
|
||||||
} else {
|
} else {
|
||||||
actor = new Actor("Dispenser");
|
actor = new Actor("Dispenser");
|
||||||
}
|
}
|
||||||
} else if (event.getCause() == IgniteCause.LIGHTNING) {
|
} else if (event.getCause() == IgniteCause.LIGHTNING) {
|
||||||
actor = new Actor("Lightning");
|
actor = new Actor("Lightning");
|
||||||
} else if (event.getCause() == IgniteCause.EXPLOSION) {
|
} else if (event.getCause() == IgniteCause.EXPLOSION) {
|
||||||
actor = new Actor("Explosion");
|
actor = new Actor("Explosion");
|
||||||
} else if (event.getCause() == IgniteCause.LAVA) {
|
} else if (event.getCause() == IgniteCause.LAVA) {
|
||||||
actor = new Actor("Lava");
|
actor = new Actor("Lava");
|
||||||
} else if (event.getCause() == IgniteCause.ENDER_CRYSTAL) {
|
} else if (event.getCause() == IgniteCause.ENDER_CRYSTAL) {
|
||||||
actor = new Actor("EnderCrystal");
|
actor = new Actor("EnderCrystal");
|
||||||
}
|
}
|
||||||
if (isLogging(event.getBlock().getWorld(), Logging.FIRE)) {
|
if (isLogging(event.getBlock().getWorld(), Logging.FIRE)) {
|
||||||
consumer.queueBlockPlace(actor, event.getBlock().getLocation(), Material.FIRE.createBlockData());
|
consumer.queueBlockPlace(actor, event.getBlock().getLocation(), Material.FIRE.createBlockData());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onExtinguish(PlayerInteractEvent event) {
|
public void onExtinguish(PlayerInteractEvent event) {
|
||||||
if (event.getAction().equals(Action.LEFT_CLICK_BLOCK)) {
|
if (event.getAction().equals(Action.LEFT_CLICK_BLOCK)) {
|
||||||
Player player = event.getPlayer();
|
Player player = event.getPlayer();
|
||||||
Block block = event.getClickedBlock().getRelative(event.getBlockFace());
|
Block block = event.getClickedBlock().getRelative(event.getBlockFace());
|
||||||
if (block.getType().equals(Material.FIRE) && isLogging(player.getWorld(), Logging.FIRE)) {
|
if (block.getType().equals(Material.FIRE) && isLogging(player.getWorld(), Logging.FIRE)) {
|
||||||
Actor actor = Actor.actorFromEntity(player);
|
Actor actor = Actor.actorFromEntity(player);
|
||||||
smartLogBlockBreak(consumer, actor, block);
|
smartLogBlockBreak(consumer, actor, block);
|
||||||
smartLogFallables(consumer, actor, block);
|
smartLogFallables(consumer, actor, block);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,67 +1,67 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.Actor;
|
import de.diddiz.LogBlock.Actor;
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import de.diddiz.LogBlock.Logging;
|
import de.diddiz.LogBlock.Logging;
|
||||||
import de.diddiz.LogBlock.config.Config;
|
import de.diddiz.LogBlock.config.Config;
|
||||||
import de.diddiz.LogBlock.util.LoggingUtil;
|
import de.diddiz.LogBlock.util.LoggingUtil;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.BlockState;
|
import org.bukkit.block.BlockState;
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
import org.bukkit.block.data.Waterlogged;
|
import org.bukkit.block.data.Waterlogged;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.block.BlockPlaceEvent;
|
import org.bukkit.event.block.BlockPlaceEvent;
|
||||||
import org.bukkit.event.player.PlayerBucketEmptyEvent;
|
import org.bukkit.event.player.PlayerBucketEmptyEvent;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.isLogging;
|
import static de.diddiz.LogBlock.config.Config.isLogging;
|
||||||
|
|
||||||
public class BlockPlaceLogging extends LoggingListener {
|
public class BlockPlaceLogging extends LoggingListener {
|
||||||
public BlockPlaceLogging(LogBlock lb) {
|
public BlockPlaceLogging(LogBlock lb) {
|
||||||
super(lb);
|
super(lb);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onBlockPlace(BlockPlaceEvent event) {
|
public void onBlockPlace(BlockPlaceEvent event) {
|
||||||
if (Config.isLogging(event.getBlock().getWorld(), Logging.BLOCKPLACE)) {
|
if (Config.isLogging(event.getBlock().getWorld(), Logging.BLOCKPLACE)) {
|
||||||
final BlockState before = event.getBlockReplacedState();
|
final BlockState before = event.getBlockReplacedState();
|
||||||
final BlockState after = event.getBlockPlaced().getState();
|
final BlockState after = event.getBlockPlaced().getState();
|
||||||
final Actor actor = Actor.actorFromEntity(event.getPlayer());
|
final Actor actor = Actor.actorFromEntity(event.getPlayer());
|
||||||
if (before.getType() == Material.LECTERN && after.getType() == Material.LECTERN) {
|
if (before.getType() == Material.LECTERN && after.getType() == Material.LECTERN) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
LoggingUtil.smartLogBlockPlace(consumer, actor, before, after);
|
LoggingUtil.smartLogBlockPlace(consumer, actor, before, after);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
|
public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
|
||||||
if (isLogging(event.getPlayer().getWorld(), Logging.BLOCKPLACE)) {
|
if (isLogging(event.getPlayer().getWorld(), Logging.BLOCKPLACE)) {
|
||||||
Material placedMaterial = event.getBucket() == Material.LAVA_BUCKET ? Material.LAVA : Material.WATER;
|
Material placedMaterial = event.getBucket() == Material.LAVA_BUCKET ? Material.LAVA : Material.WATER;
|
||||||
BlockData clickedBlockData = event.getBlockClicked().getBlockData();
|
BlockData clickedBlockData = event.getBlockClicked().getBlockData();
|
||||||
if (placedMaterial == Material.WATER && clickedBlockData instanceof Waterlogged) {
|
if (placedMaterial == Material.WATER && clickedBlockData instanceof Waterlogged) {
|
||||||
Waterlogged clickedWaterlogged = (Waterlogged) clickedBlockData;
|
Waterlogged clickedWaterlogged = (Waterlogged) clickedBlockData;
|
||||||
if (!clickedWaterlogged.isWaterlogged()) {
|
if (!clickedWaterlogged.isWaterlogged()) {
|
||||||
Waterlogged clickedWaterloggedWithWater = (Waterlogged) clickedWaterlogged.clone();
|
Waterlogged clickedWaterloggedWithWater = (Waterlogged) clickedWaterlogged.clone();
|
||||||
clickedWaterloggedWithWater.setWaterlogged(true);
|
clickedWaterloggedWithWater.setWaterlogged(true);
|
||||||
consumer.queueBlockReplace(Actor.actorFromEntity(event.getPlayer()), event.getBlockClicked().getLocation(), clickedWaterlogged, clickedWaterloggedWithWater);
|
consumer.queueBlockReplace(Actor.actorFromEntity(event.getPlayer()), event.getBlockClicked().getLocation(), clickedWaterlogged, clickedWaterloggedWithWater);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Block placedAt = event.getBlockClicked().getRelative(event.getBlockFace());
|
Block placedAt = event.getBlockClicked().getRelative(event.getBlockFace());
|
||||||
if (placedAt.isEmpty()) {
|
if (placedAt.isEmpty()) {
|
||||||
consumer.queueBlockPlace(Actor.actorFromEntity(event.getPlayer()), placedAt.getLocation(), placedMaterial.createBlockData());
|
consumer.queueBlockPlace(Actor.actorFromEntity(event.getPlayer()), placedAt.getLocation(), placedMaterial.createBlockData());
|
||||||
} else {
|
} else {
|
||||||
BlockData placedAtBlock = placedAt.getBlockData();
|
BlockData placedAtBlock = placedAt.getBlockData();
|
||||||
if (placedAtBlock instanceof Waterlogged && !(((Waterlogged) placedAtBlock).isWaterlogged())) {
|
if (placedAtBlock instanceof Waterlogged && !(((Waterlogged) placedAtBlock).isWaterlogged())) {
|
||||||
Waterlogged clickedWaterloggedWithWater = (Waterlogged) placedAtBlock.clone();
|
Waterlogged clickedWaterloggedWithWater = (Waterlogged) placedAtBlock.clone();
|
||||||
clickedWaterloggedWithWater.setWaterlogged(true);
|
clickedWaterloggedWithWater.setWaterlogged(true);
|
||||||
consumer.queueBlockReplace(Actor.actorFromEntity(event.getPlayer()), placedAt.getLocation(), placedAtBlock, clickedWaterloggedWithWater);
|
consumer.queueBlockReplace(Actor.actorFromEntity(event.getPlayer()), placedAt.getLocation(), placedAtBlock, clickedWaterloggedWithWater);
|
||||||
} else {
|
} else {
|
||||||
consumer.queueBlockReplace(Actor.actorFromEntity(event.getPlayer()), placedAt.getLocation(), placedAtBlock, placedMaterial.createBlockData());
|
consumer.queueBlockReplace(Actor.actorFromEntity(event.getPlayer()), placedAt.getLocation(), placedAtBlock, placedMaterial.createBlockData());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,58 +1,58 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.Actor;
|
import de.diddiz.LogBlock.Actor;
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import de.diddiz.LogBlock.Logging;
|
import de.diddiz.LogBlock.Logging;
|
||||||
import org.bukkit.command.BlockCommandSender;
|
import org.bukkit.command.BlockCommandSender;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.entity.minecart.CommandMinecart;
|
import org.bukkit.entity.minecart.CommandMinecart;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.player.AsyncPlayerChatEvent;
|
import org.bukkit.event.player.AsyncPlayerChatEvent;
|
||||||
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
|
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
|
||||||
import org.bukkit.event.server.ServerCommandEvent;
|
import org.bukkit.event.server.ServerCommandEvent;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.isLogging;
|
import static de.diddiz.LogBlock.config.Config.isLogging;
|
||||||
|
|
||||||
public class ChatLogging extends LoggingListener {
|
public class ChatLogging extends LoggingListener {
|
||||||
public ChatLogging(LogBlock lb) {
|
public ChatLogging(LogBlock lb) {
|
||||||
super(lb);
|
super(lb);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR)
|
@EventHandler(priority = EventPriority.MONITOR)
|
||||||
public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
|
public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
|
||||||
if (isLogging(event.getPlayer().getWorld(), Logging.PLAYER_COMMANDS)) {
|
if (isLogging(event.getPlayer().getWorld(), Logging.PLAYER_COMMANDS)) {
|
||||||
consumer.queueChat(Actor.actorFromEntity(event.getPlayer()), event.getMessage());
|
consumer.queueChat(Actor.actorFromEntity(event.getPlayer()), event.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR)
|
@EventHandler(priority = EventPriority.MONITOR)
|
||||||
public void onPlayerChat(AsyncPlayerChatEvent event) {
|
public void onPlayerChat(AsyncPlayerChatEvent event) {
|
||||||
if (isLogging(event.getPlayer().getWorld(), Logging.CHAT)) {
|
if (isLogging(event.getPlayer().getWorld(), Logging.CHAT)) {
|
||||||
consumer.queueChat(Actor.actorFromEntity(event.getPlayer()), event.getMessage());
|
consumer.queueChat(Actor.actorFromEntity(event.getPlayer()), event.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR)
|
@EventHandler(priority = EventPriority.MONITOR)
|
||||||
public void onServerCommand(ServerCommandEvent event) {
|
public void onServerCommand(ServerCommandEvent event) {
|
||||||
CommandSender sender = event.getSender();
|
CommandSender sender = event.getSender();
|
||||||
Actor actor;
|
Actor actor;
|
||||||
if (sender instanceof BlockCommandSender) {
|
if (sender instanceof BlockCommandSender) {
|
||||||
if (!isLogging(((BlockCommandSender) sender).getBlock().getWorld(), Logging.COMMANDBLOCK_COMMANDS)) {
|
if (!isLogging(((BlockCommandSender) sender).getBlock().getWorld(), Logging.COMMANDBLOCK_COMMANDS)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
actor = new Actor("CommandBlock");
|
actor = new Actor("CommandBlock");
|
||||||
} else if (sender instanceof CommandMinecart) {
|
} else if (sender instanceof CommandMinecart) {
|
||||||
if (!isLogging(((CommandMinecart) sender).getWorld(), Logging.COMMANDBLOCK_COMMANDS)) {
|
if (!isLogging(((CommandMinecart) sender).getWorld(), Logging.COMMANDBLOCK_COMMANDS)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
actor = new Actor("CommandMinecart");
|
actor = new Actor("CommandMinecart");
|
||||||
} else {
|
} else {
|
||||||
if (!isLogging(Logging.CONSOLE_COMMANDS)) {
|
if (!isLogging(Logging.CONSOLE_COMMANDS)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
actor = new Actor("Console");
|
actor = new Actor("Console");
|
||||||
}
|
}
|
||||||
consumer.queueChat(actor, "/" + event.getCommand());
|
consumer.queueChat(actor, "/" + event.getCommand());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,303 +1,303 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.Actor;
|
import de.diddiz.LogBlock.Actor;
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import de.diddiz.LogBlock.Logging;
|
import de.diddiz.LogBlock.Logging;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.block.BlockState;
|
import org.bukkit.block.BlockState;
|
||||||
import org.bukkit.block.DoubleChest;
|
import org.bukkit.block.DoubleChest;
|
||||||
import org.bukkit.entity.HumanEntity;
|
import org.bukkit.entity.HumanEntity;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.inventory.ClickType;
|
import org.bukkit.event.inventory.ClickType;
|
||||||
import org.bukkit.event.inventory.InventoryClickEvent;
|
import org.bukkit.event.inventory.InventoryClickEvent;
|
||||||
import org.bukkit.event.inventory.InventoryCloseEvent;
|
import org.bukkit.event.inventory.InventoryCloseEvent;
|
||||||
import org.bukkit.event.inventory.InventoryDragEvent;
|
import org.bukkit.event.inventory.InventoryDragEvent;
|
||||||
import org.bukkit.event.inventory.InventoryOpenEvent;
|
import org.bukkit.event.inventory.InventoryOpenEvent;
|
||||||
import org.bukkit.inventory.Inventory;
|
import org.bukkit.inventory.Inventory;
|
||||||
import org.bukkit.inventory.InventoryHolder;
|
import org.bukkit.inventory.InventoryHolder;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.isLogging;
|
import static de.diddiz.LogBlock.config.Config.isLogging;
|
||||||
import static de.diddiz.LogBlock.util.BukkitUtils.*;
|
import static de.diddiz.LogBlock.util.BukkitUtils.*;
|
||||||
|
|
||||||
public class ChestAccessLogging extends LoggingListener {
|
public class ChestAccessLogging extends LoggingListener {
|
||||||
private class PlayerActiveInventoryModifications {
|
private class PlayerActiveInventoryModifications {
|
||||||
private final HumanEntity actor;
|
private final HumanEntity actor;
|
||||||
private final Location location;
|
private final Location location;
|
||||||
private final HashMap<ItemStack, Integer> modifications;
|
private final HashMap<ItemStack, Integer> modifications;
|
||||||
|
|
||||||
public PlayerActiveInventoryModifications(HumanEntity actor, Location location) {
|
public PlayerActiveInventoryModifications(HumanEntity actor, Location location) {
|
||||||
this.actor = actor;
|
this.actor = actor;
|
||||||
this.location = location;
|
this.location = location;
|
||||||
this.modifications = new HashMap<>();
|
this.modifications = new HashMap<>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addModification(ItemStack stack, int amount) {
|
public void addModification(ItemStack stack, int amount) {
|
||||||
if (amount == 0) {
|
if (amount == 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// if we have other viewers, we have to flush their changes
|
// if we have other viewers, we have to flush their changes
|
||||||
ArrayList<PlayerActiveInventoryModifications> allViewers = containersByLocation.get(location);
|
ArrayList<PlayerActiveInventoryModifications> allViewers = containersByLocation.get(location);
|
||||||
if (allViewers.size() > 1) {
|
if (allViewers.size() > 1) {
|
||||||
for (PlayerActiveInventoryModifications other : allViewers) {
|
for (PlayerActiveInventoryModifications other : allViewers) {
|
||||||
if (other != this) {
|
if (other != this) {
|
||||||
other.flush();
|
other.flush();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// consumer.getLogblock().getLogger().info("Modify container: " + stack + " change: " + amount);
|
// consumer.getLogblock().getLogger().info("Modify container: " + stack + " change: " + amount);
|
||||||
stack = new ItemStack(stack);
|
stack = new ItemStack(stack);
|
||||||
stack.setAmount(1);
|
stack.setAmount(1);
|
||||||
Integer existing = modifications.get(stack);
|
Integer existing = modifications.get(stack);
|
||||||
int newTotal = amount + (existing == null ? 0 : existing);
|
int newTotal = amount + (existing == null ? 0 : existing);
|
||||||
if (newTotal == 0) {
|
if (newTotal == 0) {
|
||||||
modifications.remove(stack);
|
modifications.remove(stack);
|
||||||
} else {
|
} else {
|
||||||
modifications.put(stack, newTotal);
|
modifications.put(stack, newTotal);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void flush() {
|
public void flush() {
|
||||||
if (!modifications.isEmpty()) {
|
if (!modifications.isEmpty()) {
|
||||||
for (Entry<ItemStack, Integer> e : modifications.entrySet()) {
|
for (Entry<ItemStack, Integer> e : modifications.entrySet()) {
|
||||||
ItemStack stack = e.getKey();
|
ItemStack stack = e.getKey();
|
||||||
int amount = e.getValue();
|
int amount = e.getValue();
|
||||||
stack.setAmount(Math.abs(amount));
|
stack.setAmount(Math.abs(amount));
|
||||||
// consumer.getLogblock().getLogger().info("Store container: " + stack + " take: " + (amount < 0));
|
// consumer.getLogblock().getLogger().info("Store container: " + stack + " take: " + (amount < 0));
|
||||||
consumer.queueChestAccess(Actor.actorFromEntity(actor), location, location.getWorld().getBlockAt(location).getBlockData(), stack, amount < 0);
|
consumer.queueChestAccess(Actor.actorFromEntity(actor), location, location.getWorld().getBlockAt(location).getBlockData(), stack, amount < 0);
|
||||||
}
|
}
|
||||||
modifications.clear();
|
modifications.clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public HumanEntity getActor() {
|
public HumanEntity getActor() {
|
||||||
return actor;
|
return actor;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Location getLocation() {
|
public Location getLocation() {
|
||||||
return location;
|
return location;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private final Map<HumanEntity, PlayerActiveInventoryModifications> containersByOwner = new HashMap<>();
|
private final Map<HumanEntity, PlayerActiveInventoryModifications> containersByOwner = new HashMap<>();
|
||||||
private final Map<Location, ArrayList<PlayerActiveInventoryModifications>> containersByLocation = new HashMap<>();
|
private final Map<Location, ArrayList<PlayerActiveInventoryModifications>> containersByLocation = new HashMap<>();
|
||||||
|
|
||||||
public ChestAccessLogging(LogBlock lb) {
|
public ChestAccessLogging(LogBlock lb) {
|
||||||
super(lb);
|
super(lb);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onInventoryClose(InventoryCloseEvent event) {
|
public void onInventoryClose(InventoryCloseEvent event) {
|
||||||
final HumanEntity player = event.getPlayer();
|
final HumanEntity player = event.getPlayer();
|
||||||
if (!isLogging(player.getWorld(), Logging.CHESTACCESS)) {
|
if (!isLogging(player.getWorld(), Logging.CHESTACCESS)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
InventoryHolder holder = event.getInventory().getHolder();
|
InventoryHolder holder = event.getInventory().getHolder();
|
||||||
if (holder instanceof BlockState || holder instanceof DoubleChest) {
|
if (holder instanceof BlockState || holder instanceof DoubleChest) {
|
||||||
final PlayerActiveInventoryModifications modifications = containersByOwner.remove(player);
|
final PlayerActiveInventoryModifications modifications = containersByOwner.remove(player);
|
||||||
if (modifications != null) {
|
if (modifications != null) {
|
||||||
final Location loc = modifications.getLocation();
|
final Location loc = modifications.getLocation();
|
||||||
ArrayList<PlayerActiveInventoryModifications> atLocation = containersByLocation.get(loc);
|
ArrayList<PlayerActiveInventoryModifications> atLocation = containersByLocation.get(loc);
|
||||||
atLocation.remove(modifications);
|
atLocation.remove(modifications);
|
||||||
if (atLocation.isEmpty()) {
|
if (atLocation.isEmpty()) {
|
||||||
containersByLocation.remove(loc);
|
containersByLocation.remove(loc);
|
||||||
}
|
}
|
||||||
modifications.flush();
|
modifications.flush();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onInventoryOpen(InventoryOpenEvent event) {
|
public void onInventoryOpen(InventoryOpenEvent event) {
|
||||||
final HumanEntity player = event.getPlayer();
|
final HumanEntity player = event.getPlayer();
|
||||||
if (!isLogging(player.getWorld(), Logging.CHESTACCESS)) {
|
if (!isLogging(player.getWorld(), Logging.CHESTACCESS)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (event.getInventory() != null) {
|
if (event.getInventory() != null) {
|
||||||
InventoryHolder holder = event.getInventory().getHolder();
|
InventoryHolder holder = event.getInventory().getHolder();
|
||||||
if (holder instanceof BlockState || holder instanceof DoubleChest) {
|
if (holder instanceof BlockState || holder instanceof DoubleChest) {
|
||||||
if (getInventoryHolderType(holder) != Material.CRAFTING_TABLE) {
|
if (getInventoryHolderType(holder) != Material.CRAFTING_TABLE) {
|
||||||
PlayerActiveInventoryModifications modifications = new PlayerActiveInventoryModifications(event.getPlayer(), getInventoryHolderLocation(holder));
|
PlayerActiveInventoryModifications modifications = new PlayerActiveInventoryModifications(event.getPlayer(), getInventoryHolderLocation(holder));
|
||||||
containersByOwner.put(modifications.getActor(), modifications);
|
containersByOwner.put(modifications.getActor(), modifications);
|
||||||
containersByLocation.compute(modifications.getLocation(), (k, v) -> {
|
containersByLocation.compute(modifications.getLocation(), (k, v) -> {
|
||||||
if (v == null) {
|
if (v == null) {
|
||||||
v = new ArrayList<>();
|
v = new ArrayList<>();
|
||||||
}
|
}
|
||||||
v.add(modifications);
|
v.add(modifications);
|
||||||
return v;
|
return v;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onInventoryClick(InventoryClickEvent event) {
|
public void onInventoryClick(InventoryClickEvent event) {
|
||||||
final HumanEntity player = event.getWhoClicked();
|
final HumanEntity player = event.getWhoClicked();
|
||||||
if (!isLogging(player.getWorld(), Logging.CHESTACCESS)) {
|
if (!isLogging(player.getWorld(), Logging.CHESTACCESS)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
InventoryHolder holder = event.getInventory().getHolder();
|
InventoryHolder holder = event.getInventory().getHolder();
|
||||||
if (holder instanceof BlockState || holder instanceof DoubleChest) {
|
if (holder instanceof BlockState || holder instanceof DoubleChest) {
|
||||||
final PlayerActiveInventoryModifications modifications = containersByOwner.get(player);
|
final PlayerActiveInventoryModifications modifications = containersByOwner.get(player);
|
||||||
if (modifications != null) {
|
if (modifications != null) {
|
||||||
switch (event.getAction()) {
|
switch (event.getAction()) {
|
||||||
case PICKUP_ONE:
|
case PICKUP_ONE:
|
||||||
case DROP_ONE_SLOT:
|
case DROP_ONE_SLOT:
|
||||||
if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
|
if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
|
||||||
modifications.addModification(event.getCurrentItem(), -1);
|
modifications.addModification(event.getCurrentItem(), -1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case PICKUP_HALF:
|
case PICKUP_HALF:
|
||||||
// server behaviour: round up
|
// server behaviour: round up
|
||||||
if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
|
if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
|
||||||
modifications.addModification(event.getCurrentItem(), -(event.getCurrentItem().getAmount() + 1) / 2);
|
modifications.addModification(event.getCurrentItem(), -(event.getCurrentItem().getAmount() + 1) / 2);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case PICKUP_SOME: // oversized stack - can not take all when clicking
|
case PICKUP_SOME: // oversized stack - can not take all when clicking
|
||||||
// server behaviour: leave a full stack in the slot, take everything else
|
// server behaviour: leave a full stack in the slot, take everything else
|
||||||
if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
|
if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
|
||||||
int taken = event.getCurrentItem().getAmount() - event.getCurrentItem().getMaxStackSize();
|
int taken = event.getCurrentItem().getAmount() - event.getCurrentItem().getMaxStackSize();
|
||||||
modifications.addModification(event.getCursor(), -taken);
|
modifications.addModification(event.getCursor(), -taken);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case PICKUP_ALL:
|
case PICKUP_ALL:
|
||||||
case DROP_ALL_SLOT:
|
case DROP_ALL_SLOT:
|
||||||
if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
|
if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
|
||||||
modifications.addModification(event.getCurrentItem(), -event.getCurrentItem().getAmount());
|
modifications.addModification(event.getCurrentItem(), -event.getCurrentItem().getAmount());
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case PLACE_ONE:
|
case PLACE_ONE:
|
||||||
if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
|
if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
|
||||||
modifications.addModification(event.getCursor(), 1);
|
modifications.addModification(event.getCursor(), 1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case PLACE_SOME: // not enough free place in target slot
|
case PLACE_SOME: // not enough free place in target slot
|
||||||
// server behaviour: place as much as possible
|
// server behaviour: place as much as possible
|
||||||
if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
|
if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
|
||||||
int placeable = event.getCurrentItem().getMaxStackSize() - event.getCurrentItem().getAmount();
|
int placeable = event.getCurrentItem().getMaxStackSize() - event.getCurrentItem().getAmount();
|
||||||
modifications.addModification(event.getCursor(), placeable);
|
modifications.addModification(event.getCursor(), placeable);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case PLACE_ALL:
|
case PLACE_ALL:
|
||||||
if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
|
if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
|
||||||
modifications.addModification(event.getCursor(), event.getCursor().getAmount());
|
modifications.addModification(event.getCursor(), event.getCursor().getAmount());
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case SWAP_WITH_CURSOR:
|
case SWAP_WITH_CURSOR:
|
||||||
if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
|
if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
|
||||||
modifications.addModification(event.getCursor(), event.getCursor().getAmount());
|
modifications.addModification(event.getCursor(), event.getCursor().getAmount());
|
||||||
modifications.addModification(event.getCurrentItem(), -event.getCurrentItem().getAmount());
|
modifications.addModification(event.getCurrentItem(), -event.getCurrentItem().getAmount());
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case MOVE_TO_OTHER_INVENTORY: // shift + click
|
case MOVE_TO_OTHER_INVENTORY: // shift + click
|
||||||
boolean removed = event.getRawSlot() < event.getView().getTopInventory().getSize();
|
boolean removed = event.getRawSlot() < event.getView().getTopInventory().getSize();
|
||||||
modifications.addModification(event.getCurrentItem(), event.getCurrentItem().getAmount() * (removed ? -1 : 1));
|
modifications.addModification(event.getCurrentItem(), event.getCurrentItem().getAmount() * (removed ? -1 : 1));
|
||||||
break;
|
break;
|
||||||
case COLLECT_TO_CURSOR: // double click
|
case COLLECT_TO_CURSOR: // double click
|
||||||
// server behaviour: first collect all with an amount != maxstacksize, then others, starting from slot 0 (container)
|
// server behaviour: first collect all with an amount != maxstacksize, then others, starting from slot 0 (container)
|
||||||
ItemStack cursor = event.getCursor();
|
ItemStack cursor = event.getCursor();
|
||||||
if (cursor == null) {
|
if (cursor == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int toPickUp = cursor.getMaxStackSize() - cursor.getAmount();
|
int toPickUp = cursor.getMaxStackSize() - cursor.getAmount();
|
||||||
int takenFromContainer = 0;
|
int takenFromContainer = 0;
|
||||||
boolean takeFromFullStacks = false;
|
boolean takeFromFullStacks = false;
|
||||||
Inventory top = event.getView().getTopInventory();
|
Inventory top = event.getView().getTopInventory();
|
||||||
Inventory bottom = event.getView().getBottomInventory();
|
Inventory bottom = event.getView().getBottomInventory();
|
||||||
while (toPickUp > 0) {
|
while (toPickUp > 0) {
|
||||||
for (ItemStack stack : top.getStorageContents()) {
|
for (ItemStack stack : top.getStorageContents()) {
|
||||||
if (cursor.isSimilar(stack)) {
|
if (cursor.isSimilar(stack)) {
|
||||||
if (takeFromFullStacks == (stack.getAmount() == stack.getMaxStackSize())) {
|
if (takeFromFullStacks == (stack.getAmount() == stack.getMaxStackSize())) {
|
||||||
int take = Math.min(toPickUp, stack.getAmount());
|
int take = Math.min(toPickUp, stack.getAmount());
|
||||||
toPickUp -= take;
|
toPickUp -= take;
|
||||||
takenFromContainer += take;
|
takenFromContainer += take;
|
||||||
if (toPickUp <= 0) {
|
if (toPickUp <= 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (toPickUp <= 0) {
|
if (toPickUp <= 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
for (ItemStack stack : bottom.getStorageContents()) {
|
for (ItemStack stack : bottom.getStorageContents()) {
|
||||||
if (cursor.isSimilar(stack)) {
|
if (cursor.isSimilar(stack)) {
|
||||||
if (takeFromFullStacks == (stack.getAmount() == stack.getMaxStackSize())) {
|
if (takeFromFullStacks == (stack.getAmount() == stack.getMaxStackSize())) {
|
||||||
int take = Math.min(toPickUp, stack.getAmount());
|
int take = Math.min(toPickUp, stack.getAmount());
|
||||||
toPickUp -= take;
|
toPickUp -= take;
|
||||||
if (toPickUp <= 0) {
|
if (toPickUp <= 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (takeFromFullStacks) {
|
if (takeFromFullStacks) {
|
||||||
break;
|
break;
|
||||||
} else {
|
} else {
|
||||||
takeFromFullStacks = true;
|
takeFromFullStacks = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (takenFromContainer > 0) {
|
if (takenFromContainer > 0) {
|
||||||
modifications.addModification(event.getCursor(), -takenFromContainer);
|
modifications.addModification(event.getCursor(), -takenFromContainer);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case HOTBAR_SWAP: // number key or offhand key
|
case HOTBAR_SWAP: // number key or offhand key
|
||||||
case HOTBAR_MOVE_AND_READD: // something was in the other slot
|
case HOTBAR_MOVE_AND_READD: // something was in the other slot
|
||||||
if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
|
if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
|
||||||
ItemStack otherSlot = (event.getClick() == ClickType.SWAP_OFFHAND) ? event.getWhoClicked().getInventory().getItemInOffHand() : event.getWhoClicked().getInventory().getItem(event.getHotbarButton());
|
ItemStack otherSlot = (event.getClick() == ClickType.SWAP_OFFHAND) ? event.getWhoClicked().getInventory().getItemInOffHand() : event.getWhoClicked().getInventory().getItem(event.getHotbarButton());
|
||||||
if (event.getCurrentItem() != null && event.getCurrentItem().getType() != Material.AIR) {
|
if (event.getCurrentItem() != null && event.getCurrentItem().getType() != Material.AIR) {
|
||||||
modifications.addModification(event.getCurrentItem(), -event.getCurrentItem().getAmount());
|
modifications.addModification(event.getCurrentItem(), -event.getCurrentItem().getAmount());
|
||||||
}
|
}
|
||||||
if (otherSlot != null && otherSlot.getType() != Material.AIR) {
|
if (otherSlot != null && otherSlot.getType() != Material.AIR) {
|
||||||
modifications.addModification(otherSlot, otherSlot.getAmount());
|
modifications.addModification(otherSlot, otherSlot.getAmount());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case DROP_ALL_CURSOR:
|
case DROP_ALL_CURSOR:
|
||||||
case DROP_ONE_CURSOR:
|
case DROP_ONE_CURSOR:
|
||||||
case CLONE_STACK:
|
case CLONE_STACK:
|
||||||
case NOTHING:
|
case NOTHING:
|
||||||
// only the cursor or nothing (but not the inventory) was modified
|
// only the cursor or nothing (but not the inventory) was modified
|
||||||
break;
|
break;
|
||||||
case UNKNOWN:
|
case UNKNOWN:
|
||||||
default:
|
default:
|
||||||
// unable to log something we don't know
|
// unable to log something we don't know
|
||||||
consumer.getLogblock().getLogger().warning("Unknown inventory action by " + event.getWhoClicked().getName() + ": " + event.getAction() + " Slot: " + event.getSlot() + " Slot type: " + event.getSlotType());
|
consumer.getLogblock().getLogger().warning("Unknown inventory action by " + event.getWhoClicked().getName() + ": " + event.getAction() + " Slot: " + event.getSlot() + " Slot type: " + event.getSlotType());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onInventoryDrag(InventoryDragEvent event) {
|
public void onInventoryDrag(InventoryDragEvent event) {
|
||||||
final HumanEntity player = event.getWhoClicked();
|
final HumanEntity player = event.getWhoClicked();
|
||||||
if (!isLogging(player.getWorld(), Logging.CHESTACCESS)) {
|
if (!isLogging(player.getWorld(), Logging.CHESTACCESS)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
InventoryHolder holder = event.getInventory().getHolder();
|
InventoryHolder holder = event.getInventory().getHolder();
|
||||||
if (holder instanceof BlockState || holder instanceof DoubleChest) {
|
if (holder instanceof BlockState || holder instanceof DoubleChest) {
|
||||||
final PlayerActiveInventoryModifications modifications = containersByOwner.get(player);
|
final PlayerActiveInventoryModifications modifications = containersByOwner.get(player);
|
||||||
if (modifications != null) {
|
if (modifications != null) {
|
||||||
Inventory container = event.getView().getTopInventory();
|
Inventory container = event.getView().getTopInventory();
|
||||||
int containerSize = container.getSize();
|
int containerSize = container.getSize();
|
||||||
for (Entry<Integer, ItemStack> e : event.getNewItems().entrySet()) {
|
for (Entry<Integer, ItemStack> e : event.getNewItems().entrySet()) {
|
||||||
int slot = e.getKey();
|
int slot = e.getKey();
|
||||||
if (slot < containerSize) {
|
if (slot < containerSize) {
|
||||||
ItemStack old = container.getItem(slot);
|
ItemStack old = container.getItem(slot);
|
||||||
int oldAmount = (old == null || old.getType() == Material.AIR) ? 0 : old.getAmount();
|
int oldAmount = (old == null || old.getType() == Material.AIR) ? 0 : old.getAmount();
|
||||||
modifications.addModification(e.getValue(), e.getValue().getAmount() - oldAmount);
|
modifications.addModification(e.getValue(), e.getValue().getAmount() - oldAmount);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,24 +1,24 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.Actor;
|
import de.diddiz.LogBlock.Actor;
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import de.diddiz.LogBlock.Logging;
|
import de.diddiz.LogBlock.Logging;
|
||||||
import org.bukkit.entity.Enderman;
|
import org.bukkit.entity.Enderman;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.entity.EntityChangeBlockEvent;
|
import org.bukkit.event.entity.EntityChangeBlockEvent;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.isLogging;
|
import static de.diddiz.LogBlock.config.Config.isLogging;
|
||||||
|
|
||||||
public class EndermenLogging extends LoggingListener {
|
public class EndermenLogging extends LoggingListener {
|
||||||
public EndermenLogging(LogBlock lb) {
|
public EndermenLogging(LogBlock lb) {
|
||||||
super(lb);
|
super(lb);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onEntityChangeBlock(EntityChangeBlockEvent event) {
|
public void onEntityChangeBlock(EntityChangeBlockEvent event) {
|
||||||
if (event.getEntity() instanceof Enderman && isLogging(event.getBlock().getWorld(), Logging.ENDERMEN)) {
|
if (event.getEntity() instanceof Enderman && isLogging(event.getBlock().getWorld(), Logging.ENDERMEN)) {
|
||||||
consumer.queueBlockReplace(new Actor("Enderman"), event.getBlock().getState(), event.getBlockData()); // Figure out how to get the data of the placed block;
|
consumer.queueBlockReplace(new Actor("Enderman"), event.getBlock().getState(), event.getBlockData()); // Figure out how to get the data of the placed block;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,229 +1,229 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.Actor;
|
import de.diddiz.LogBlock.Actor;
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import de.diddiz.LogBlock.Logging;
|
import de.diddiz.LogBlock.Logging;
|
||||||
import de.diddiz.LogBlock.config.Config;
|
import de.diddiz.LogBlock.config.Config;
|
||||||
import de.diddiz.LogBlock.config.WorldConfig;
|
import de.diddiz.LogBlock.config.WorldConfig;
|
||||||
import de.diddiz.LogBlock.util.BukkitUtils;
|
import de.diddiz.LogBlock.util.BukkitUtils;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.data.type.RespawnAnchor;
|
import org.bukkit.block.data.type.RespawnAnchor;
|
||||||
import org.bukkit.entity.*;
|
import org.bukkit.entity.*;
|
||||||
import org.bukkit.entity.minecart.ExplosiveMinecart;
|
import org.bukkit.entity.minecart.ExplosiveMinecart;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.block.Action;
|
import org.bukkit.event.block.Action;
|
||||||
import org.bukkit.event.block.BlockExplodeEvent;
|
import org.bukkit.event.block.BlockExplodeEvent;
|
||||||
import org.bukkit.event.entity.EntityExplodeEvent;
|
import org.bukkit.event.entity.EntityExplodeEvent;
|
||||||
import org.bukkit.event.player.PlayerInteractEvent;
|
import org.bukkit.event.player.PlayerInteractEvent;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.bukkit.projectiles.ProjectileSource;
|
import org.bukkit.projectiles.ProjectileSource;
|
||||||
import org.bukkit.scheduler.BukkitRunnable;
|
import org.bukkit.scheduler.BukkitRunnable;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.getWorldConfig;
|
import static de.diddiz.LogBlock.config.Config.getWorldConfig;
|
||||||
import static de.diddiz.LogBlock.config.Config.logCreeperExplosionsAsPlayerWhoTriggeredThese;
|
import static de.diddiz.LogBlock.config.Config.logCreeperExplosionsAsPlayerWhoTriggeredThese;
|
||||||
import static de.diddiz.LogBlock.util.BukkitUtils.getContainerBlocks;
|
import static de.diddiz.LogBlock.util.BukkitUtils.getContainerBlocks;
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
public class ExplosionLogging extends LoggingListener {
|
public class ExplosionLogging extends LoggingListener {
|
||||||
|
|
||||||
private UUID lastBedInteractionPlayer;
|
private UUID lastBedInteractionPlayer;
|
||||||
private Location lastBedInteractionLocation;
|
private Location lastBedInteractionLocation;
|
||||||
private UUID lastRespawnAnchorInteractionPlayer;
|
private UUID lastRespawnAnchorInteractionPlayer;
|
||||||
private Location lastRespawnAnchorInteractionLocation;
|
private Location lastRespawnAnchorInteractionLocation;
|
||||||
|
|
||||||
public ExplosionLogging(LogBlock lb) {
|
public ExplosionLogging(LogBlock lb) {
|
||||||
super(lb);
|
super(lb);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onEntityExplode(EntityExplodeEvent event) {
|
public void onEntityExplode(EntityExplodeEvent event) {
|
||||||
final WorldConfig wcfg = getWorldConfig(event.getLocation().getWorld());
|
final WorldConfig wcfg = getWorldConfig(event.getLocation().getWorld());
|
||||||
if (wcfg != null) {
|
if (wcfg != null) {
|
||||||
Actor actor = new Actor("Explosion");
|
Actor actor = new Actor("Explosion");
|
||||||
Entity source = event.getEntity();
|
Entity source = event.getEntity();
|
||||||
if (source == null) {
|
if (source == null) {
|
||||||
if (!wcfg.isLogging(Logging.MISCEXPLOSION)) {
|
if (!wcfg.isLogging(Logging.MISCEXPLOSION)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} else if (source instanceof TNTPrimed) {
|
} else if (source instanceof TNTPrimed) {
|
||||||
if (!wcfg.isLogging(Logging.TNTEXPLOSION)) {
|
if (!wcfg.isLogging(Logging.TNTEXPLOSION)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
actor = new Actor("TNT");
|
actor = new Actor("TNT");
|
||||||
} else if (source instanceof ExplosiveMinecart) {
|
} else if (source instanceof ExplosiveMinecart) {
|
||||||
if (!wcfg.isLogging(Logging.TNTMINECARTEXPLOSION)) {
|
if (!wcfg.isLogging(Logging.TNTMINECARTEXPLOSION)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
actor = new Actor("TNTMinecart");
|
actor = new Actor("TNTMinecart");
|
||||||
} else if (source instanceof Creeper) {
|
} else if (source instanceof Creeper) {
|
||||||
if (!wcfg.isLogging(Logging.CREEPEREXPLOSION)) {
|
if (!wcfg.isLogging(Logging.CREEPEREXPLOSION)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (logCreeperExplosionsAsPlayerWhoTriggeredThese) {
|
if (logCreeperExplosionsAsPlayerWhoTriggeredThese) {
|
||||||
final Entity target = ((Creeper) source).getTarget();
|
final Entity target = ((Creeper) source).getTarget();
|
||||||
actor = target instanceof Player ? Actor.actorFromEntity(target) : new Actor("Creeper");
|
actor = target instanceof Player ? Actor.actorFromEntity(target) : new Actor("Creeper");
|
||||||
} else {
|
} else {
|
||||||
actor = new Actor("Creeper");
|
actor = new Actor("Creeper");
|
||||||
}
|
}
|
||||||
} else if (source instanceof Wither) {
|
} else if (source instanceof Wither) {
|
||||||
if (!wcfg.isLogging(Logging.WITHER)) {
|
if (!wcfg.isLogging(Logging.WITHER)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
actor = Actor.actorFromEntity(source);
|
actor = Actor.actorFromEntity(source);
|
||||||
} else if (source instanceof WitherSkull) {
|
} else if (source instanceof WitherSkull) {
|
||||||
if (!wcfg.isLogging(Logging.WITHER_SKULL)) {
|
if (!wcfg.isLogging(Logging.WITHER_SKULL)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
actor = Actor.actorFromEntity(source);
|
actor = Actor.actorFromEntity(source);
|
||||||
} else if (source instanceof Fireball) {
|
} else if (source instanceof Fireball) {
|
||||||
Fireball fireball = (Fireball) source;
|
Fireball fireball = (Fireball) source;
|
||||||
ProjectileSource shooter = fireball.getShooter();
|
ProjectileSource shooter = fireball.getShooter();
|
||||||
if (shooter == null) {
|
if (shooter == null) {
|
||||||
if (!wcfg.isLogging(Logging.MISCEXPLOSION)) {
|
if (!wcfg.isLogging(Logging.MISCEXPLOSION)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
actor = Actor.actorFromEntity(source);
|
actor = Actor.actorFromEntity(source);
|
||||||
} else if (shooter instanceof Ghast) {
|
} else if (shooter instanceof Ghast) {
|
||||||
if (!wcfg.isLogging(Logging.GHASTFIREBALLEXPLOSION)) {
|
if (!wcfg.isLogging(Logging.GHASTFIREBALLEXPLOSION)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
actor = Actor.actorFromProjectileSource(shooter);
|
actor = Actor.actorFromProjectileSource(shooter);
|
||||||
} else if (shooter instanceof Wither) {
|
} else if (shooter instanceof Wither) {
|
||||||
if (!wcfg.isLogging(Logging.WITHER)) {
|
if (!wcfg.isLogging(Logging.WITHER)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
actor = Actor.actorFromProjectileSource(shooter);
|
actor = Actor.actorFromProjectileSource(shooter);
|
||||||
}
|
}
|
||||||
} else if (source instanceof EnderDragon) {
|
} else if (source instanceof EnderDragon) {
|
||||||
if (!wcfg.isLogging(Logging.ENDERDRAGON)) {
|
if (!wcfg.isLogging(Logging.ENDERDRAGON)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
actor = Actor.actorFromEntity(source);
|
actor = Actor.actorFromEntity(source);
|
||||||
} else if (source instanceof EnderCrystal) {
|
} else if (source instanceof EnderCrystal) {
|
||||||
if (!wcfg.isLogging(Logging.ENDERCRYSTALEXPLOSION)) {
|
if (!wcfg.isLogging(Logging.ENDERCRYSTALEXPLOSION)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
actor = Actor.actorFromEntity(source);
|
actor = Actor.actorFromEntity(source);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
if (!wcfg.isLogging(Logging.MISCEXPLOSION)) {
|
if (!wcfg.isLogging(Logging.MISCEXPLOSION)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (final Block block : event.blockList()) {
|
for (final Block block : event.blockList()) {
|
||||||
final Material type = block.getType();
|
final Material type = block.getType();
|
||||||
if (wcfg.isLogging(Logging.CHESTACCESS) && getContainerBlocks().contains(type) && !BukkitUtils.getShulkerBoxBlocks().contains(type)) {
|
if (wcfg.isLogging(Logging.CHESTACCESS) && getContainerBlocks().contains(type) && !BukkitUtils.getShulkerBoxBlocks().contains(type)) {
|
||||||
consumer.queueContainerBreak(actor, block.getState());
|
consumer.queueContainerBreak(actor, block.getState());
|
||||||
} else {
|
} else {
|
||||||
consumer.queueBlockBreak(actor, block.getState());
|
consumer.queueBlockBreak(actor, block.getState());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onPlayerInteract(PlayerInteractEvent event) {
|
public void onPlayerInteract(PlayerInteractEvent event) {
|
||||||
if (event.getAction() == Action.RIGHT_CLICK_BLOCK && event.hasBlock()) {
|
if (event.getAction() == Action.RIGHT_CLICK_BLOCK && event.hasBlock()) {
|
||||||
Block block = event.getClickedBlock();
|
Block block = event.getClickedBlock();
|
||||||
if (BukkitUtils.isBed(block.getType()) && !block.getWorld().isBedWorks()) {
|
if (BukkitUtils.isBed(block.getType()) && !block.getWorld().isBedWorks()) {
|
||||||
if (!Config.isLogging(block.getWorld(), Logging.BEDEXPLOSION)) {
|
if (!Config.isLogging(block.getWorld(), Logging.BEDEXPLOSION)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
lastBedInteractionPlayer = event.getPlayer().getUniqueId();
|
lastBedInteractionPlayer = event.getPlayer().getUniqueId();
|
||||||
lastBedInteractionLocation = block.getLocation();
|
lastBedInteractionLocation = block.getLocation();
|
||||||
new BukkitRunnable() {
|
new BukkitRunnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
lastBedInteractionPlayer = null;
|
lastBedInteractionPlayer = null;
|
||||||
lastBedInteractionLocation = null;
|
lastBedInteractionLocation = null;
|
||||||
}
|
}
|
||||||
}.runTask(LogBlock.getInstance());
|
}.runTask(LogBlock.getInstance());
|
||||||
} else if (block.getType() == Material.RESPAWN_ANCHOR && block.getBlockData() instanceof RespawnAnchor data) {
|
} else if (block.getType() == Material.RESPAWN_ANCHOR && block.getBlockData() instanceof RespawnAnchor data) {
|
||||||
if (!Config.isLogging(block.getWorld(), Logging.RESPAWNANCHOREXPLOSION)) {
|
if (!Config.isLogging(block.getWorld(), Logging.RESPAWNANCHOREXPLOSION)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack inHand = event.getItem();
|
ItemStack inHand = event.getItem();
|
||||||
int charges = data.getCharges();
|
int charges = data.getCharges();
|
||||||
if (charges < data.getMaximumCharges() && inHand != null && inHand.getType() == Material.GLOWSTONE) {
|
if (charges < data.getMaximumCharges() && inHand != null && inHand.getType() == Material.GLOWSTONE) {
|
||||||
// charge
|
// charge
|
||||||
Actor actor = Actor.actorFromEntity(event.getPlayer());
|
Actor actor = Actor.actorFromEntity(event.getPlayer());
|
||||||
RespawnAnchor blockNew = (RespawnAnchor) data.clone();
|
RespawnAnchor blockNew = (RespawnAnchor) data.clone();
|
||||||
blockNew.setCharges(charges + 1);
|
blockNew.setCharges(charges + 1);
|
||||||
consumer.queueBlockReplace(actor, block.getState(), blockNew);
|
consumer.queueBlockReplace(actor, block.getState(), blockNew);
|
||||||
} else if (charges > 0 && !block.getWorld().isRespawnAnchorWorks()) {
|
} else if (charges > 0 && !block.getWorld().isRespawnAnchorWorks()) {
|
||||||
// explode
|
// explode
|
||||||
Actor actor = Actor.actorFromEntity(event.getPlayer());
|
Actor actor = Actor.actorFromEntity(event.getPlayer());
|
||||||
consumer.queueBlockBreak(actor, block.getState());
|
consumer.queueBlockBreak(actor, block.getState());
|
||||||
lastRespawnAnchorInteractionPlayer = event.getPlayer().getUniqueId();
|
lastRespawnAnchorInteractionPlayer = event.getPlayer().getUniqueId();
|
||||||
lastRespawnAnchorInteractionLocation = block.getLocation();
|
lastRespawnAnchorInteractionLocation = block.getLocation();
|
||||||
new BukkitRunnable() {
|
new BukkitRunnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
lastRespawnAnchorInteractionPlayer = null;
|
lastRespawnAnchorInteractionPlayer = null;
|
||||||
lastRespawnAnchorInteractionLocation = null;
|
lastRespawnAnchorInteractionLocation = null;
|
||||||
}
|
}
|
||||||
}.runTask(LogBlock.getInstance());
|
}.runTask(LogBlock.getInstance());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onBlockExplode(BlockExplodeEvent event) {
|
public void onBlockExplode(BlockExplodeEvent event) {
|
||||||
Player bedCause = null;
|
Player bedCause = null;
|
||||||
if (lastBedInteractionPlayer != null && lastBedInteractionLocation != null) {
|
if (lastBedInteractionPlayer != null && lastBedInteractionLocation != null) {
|
||||||
Location block = event.getBlock().getLocation();
|
Location block = event.getBlock().getLocation();
|
||||||
if (lastBedInteractionLocation.getWorld() == block.getWorld() && block.distanceSquared(lastBedInteractionLocation) <= 1) {
|
if (lastBedInteractionLocation.getWorld() == block.getWorld() && block.distanceSquared(lastBedInteractionLocation) <= 1) {
|
||||||
bedCause = Bukkit.getPlayer(lastBedInteractionPlayer);
|
bedCause = Bukkit.getPlayer(lastBedInteractionPlayer);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Player respawnAnchorCause = null;
|
Player respawnAnchorCause = null;
|
||||||
if (lastRespawnAnchorInteractionPlayer != null && lastRespawnAnchorInteractionLocation != null) {
|
if (lastRespawnAnchorInteractionPlayer != null && lastRespawnAnchorInteractionLocation != null) {
|
||||||
Location block = event.getBlock().getLocation();
|
Location block = event.getBlock().getLocation();
|
||||||
if (lastRespawnAnchorInteractionLocation.equals(block)) {
|
if (lastRespawnAnchorInteractionLocation.equals(block)) {
|
||||||
respawnAnchorCause = Bukkit.getPlayer(lastRespawnAnchorInteractionPlayer);
|
respawnAnchorCause = Bukkit.getPlayer(lastRespawnAnchorInteractionPlayer);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (final Block block : event.blockList()) {
|
for (final Block block : event.blockList()) {
|
||||||
final WorldConfig wcfg = getWorldConfig(block.getLocation().getWorld());
|
final WorldConfig wcfg = getWorldConfig(block.getLocation().getWorld());
|
||||||
|
|
||||||
if (wcfg != null) {
|
if (wcfg != null) {
|
||||||
Actor actor = new Actor("Explosion");
|
Actor actor = new Actor("Explosion");
|
||||||
if (bedCause != null) {
|
if (bedCause != null) {
|
||||||
if (!wcfg.isLogging(Logging.BEDEXPLOSION)) {
|
if (!wcfg.isLogging(Logging.BEDEXPLOSION)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (Config.logBedExplosionsAsPlayerWhoTriggeredThese) {
|
if (Config.logBedExplosionsAsPlayerWhoTriggeredThese) {
|
||||||
actor = Actor.actorFromEntity(bedCause);
|
actor = Actor.actorFromEntity(bedCause);
|
||||||
} else {
|
} else {
|
||||||
actor = new Actor("BedExplosion");
|
actor = new Actor("BedExplosion");
|
||||||
}
|
}
|
||||||
} else if (respawnAnchorCause != null) {
|
} else if (respawnAnchorCause != null) {
|
||||||
if (!wcfg.isLogging(Logging.RESPAWNANCHOREXPLOSION)) {
|
if (!wcfg.isLogging(Logging.RESPAWNANCHOREXPLOSION)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (Config.logBedExplosionsAsPlayerWhoTriggeredThese) {
|
if (Config.logBedExplosionsAsPlayerWhoTriggeredThese) {
|
||||||
actor = Actor.actorFromEntity(respawnAnchorCause);
|
actor = Actor.actorFromEntity(respawnAnchorCause);
|
||||||
} else {
|
} else {
|
||||||
actor = new Actor("RespawnAnchorExplosion");
|
actor = new Actor("RespawnAnchorExplosion");
|
||||||
}
|
}
|
||||||
} else if (!wcfg.isLogging(Logging.MISCEXPLOSION)) {
|
} else if (!wcfg.isLogging(Logging.MISCEXPLOSION)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
final Material type = block.getType();
|
final Material type = block.getType();
|
||||||
if (wcfg.isLogging(Logging.CHESTACCESS) && getContainerBlocks().contains(type) && !BukkitUtils.getShulkerBoxBlocks().contains(type)) {
|
if (wcfg.isLogging(Logging.CHESTACCESS) && getContainerBlocks().contains(type) && !BukkitUtils.getShulkerBoxBlocks().contains(type)) {
|
||||||
consumer.queueContainerBreak(actor, block.getState());
|
consumer.queueContainerBreak(actor, block.getState());
|
||||||
} else {
|
} else {
|
||||||
consumer.queueBlockBreak(actor, block.getState());
|
consumer.queueBlockBreak(actor, block.getState());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,127 +1,127 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.Actor;
|
import de.diddiz.LogBlock.Actor;
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import de.diddiz.LogBlock.Logging;
|
import de.diddiz.LogBlock.Logging;
|
||||||
import de.diddiz.LogBlock.config.Config;
|
import de.diddiz.LogBlock.config.Config;
|
||||||
import de.diddiz.LogBlock.config.WorldConfig;
|
import de.diddiz.LogBlock.config.WorldConfig;
|
||||||
import de.diddiz.LogBlock.util.BukkitUtils;
|
import de.diddiz.LogBlock.util.BukkitUtils;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.BlockFace;
|
import org.bukkit.block.BlockFace;
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
import org.bukkit.block.data.Levelled;
|
import org.bukkit.block.data.Levelled;
|
||||||
import org.bukkit.block.data.Waterlogged;
|
import org.bukkit.block.data.Waterlogged;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.block.BlockFormEvent;
|
import org.bukkit.event.block.BlockFormEvent;
|
||||||
import org.bukkit.event.block.BlockFromToEvent;
|
import org.bukkit.event.block.BlockFromToEvent;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.getWorldConfig;
|
import static de.diddiz.LogBlock.config.Config.getWorldConfig;
|
||||||
|
|
||||||
public class FluidFlowLogging extends LoggingListener {
|
public class FluidFlowLogging extends LoggingListener {
|
||||||
|
|
||||||
public FluidFlowLogging(LogBlock lb) {
|
public FluidFlowLogging(LogBlock lb) {
|
||||||
super(lb);
|
super(lb);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onBlockFromTo(BlockFromToEvent event) {
|
public void onBlockFromTo(BlockFromToEvent event) {
|
||||||
final WorldConfig wcfg = getWorldConfig(event.getBlock().getWorld());
|
final WorldConfig wcfg = getWorldConfig(event.getBlock().getWorld());
|
||||||
if (wcfg != null && (wcfg.isLogging(Logging.WATERFLOW) || wcfg.isLogging(Logging.LAVAFLOW))) {
|
if (wcfg != null && (wcfg.isLogging(Logging.WATERFLOW) || wcfg.isLogging(Logging.LAVAFLOW))) {
|
||||||
final BlockData blockDataFrom = event.getBlock().getBlockData();
|
final BlockData blockDataFrom = event.getBlock().getBlockData();
|
||||||
Material typeFrom = blockDataFrom.getMaterial();
|
Material typeFrom = blockDataFrom.getMaterial();
|
||||||
boolean fromWaterlogged = false;
|
boolean fromWaterlogged = false;
|
||||||
if (blockDataFrom instanceof Waterlogged) {
|
if (blockDataFrom instanceof Waterlogged) {
|
||||||
typeFrom = Material.WATER;
|
typeFrom = Material.WATER;
|
||||||
fromWaterlogged = true;
|
fromWaterlogged = true;
|
||||||
}
|
}
|
||||||
if (typeFrom == Material.SEAGRASS || typeFrom == Material.KELP_PLANT || typeFrom == Material.KELP) {
|
if (typeFrom == Material.SEAGRASS || typeFrom == Material.KELP_PLANT || typeFrom == Material.KELP) {
|
||||||
typeFrom = Material.WATER;
|
typeFrom = Material.WATER;
|
||||||
fromWaterlogged = true;
|
fromWaterlogged = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
Block source = Config.logFluidFlowAsPlayerWhoTriggeredIt ? event.getBlock() : null;
|
Block source = Config.logFluidFlowAsPlayerWhoTriggeredIt ? event.getBlock() : null;
|
||||||
final Block to = event.getToBlock();
|
final Block to = event.getToBlock();
|
||||||
final Material typeTo = to.getType();
|
final Material typeTo = to.getType();
|
||||||
boolean down = event.getFace() == BlockFace.DOWN;
|
boolean down = event.getFace() == BlockFace.DOWN;
|
||||||
final boolean canFlow = BukkitUtils.isEmpty(typeTo) || BukkitUtils.getNonFluidProofBlocks().contains(typeTo);
|
final boolean canFlow = BukkitUtils.isEmpty(typeTo) || BukkitUtils.getNonFluidProofBlocks().contains(typeTo);
|
||||||
if (typeFrom == Material.LAVA && wcfg.isLogging(Logging.LAVAFLOW)) {
|
if (typeFrom == Material.LAVA && wcfg.isLogging(Logging.LAVAFLOW)) {
|
||||||
Levelled levelledFrom = (Levelled) blockDataFrom;
|
Levelled levelledFrom = (Levelled) blockDataFrom;
|
||||||
if (canFlow) {
|
if (canFlow) {
|
||||||
if (isSurroundedByWater(to) && levelledFrom.getLevel() <= 2) {
|
if (isSurroundedByWater(to) && levelledFrom.getLevel() <= 2) {
|
||||||
consumer.queueBlockReplace(new Actor("LavaFlow", source), to.getState(), Material.COBBLESTONE.createBlockData());
|
consumer.queueBlockReplace(new Actor("LavaFlow", source), to.getState(), Material.COBBLESTONE.createBlockData());
|
||||||
} else {
|
} else {
|
||||||
Levelled newBlock = (Levelled) blockDataFrom.clone();
|
Levelled newBlock = (Levelled) blockDataFrom.clone();
|
||||||
newBlock.setLevel(down ? 1 : Math.min(levelledFrom.getLevel() + 1, levelledFrom.getMaximumLevel()));
|
newBlock.setLevel(down ? 1 : Math.min(levelledFrom.getLevel() + 1, levelledFrom.getMaximumLevel()));
|
||||||
if (BukkitUtils.isEmpty(typeTo)) {
|
if (BukkitUtils.isEmpty(typeTo)) {
|
||||||
consumer.queueBlockPlace(new Actor("LavaFlow", source), to.getLocation(), newBlock);
|
consumer.queueBlockPlace(new Actor("LavaFlow", source), to.getLocation(), newBlock);
|
||||||
} else {
|
} else {
|
||||||
consumer.queueBlockReplace(new Actor("LavaFlow", source), to.getState(), newBlock);
|
consumer.queueBlockReplace(new Actor("LavaFlow", source), to.getState(), newBlock);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (typeTo == Material.WATER) {
|
} else if (typeTo == Material.WATER) {
|
||||||
if (down) {
|
if (down) {
|
||||||
consumer.queueBlockReplace(new Actor("LavaFlow", source), to.getState(), Material.STONE.createBlockData());
|
consumer.queueBlockReplace(new Actor("LavaFlow", source), to.getState(), Material.STONE.createBlockData());
|
||||||
} else {
|
} else {
|
||||||
consumer.queueBlockReplace(new Actor("LavaFlow", source), to.getState(), Material.COBBLESTONE.createBlockData());
|
consumer.queueBlockReplace(new Actor("LavaFlow", source), to.getState(), Material.COBBLESTONE.createBlockData());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if ((typeFrom == Material.WATER) && wcfg.isLogging(Logging.WATERFLOW)) {
|
} else if ((typeFrom == Material.WATER) && wcfg.isLogging(Logging.WATERFLOW)) {
|
||||||
Levelled levelledFrom = fromWaterlogged ? null : (Levelled) blockDataFrom;
|
Levelled levelledFrom = fromWaterlogged ? null : (Levelled) blockDataFrom;
|
||||||
Levelled newBlock = (Levelled) Material.WATER.createBlockData();
|
Levelled newBlock = (Levelled) Material.WATER.createBlockData();
|
||||||
newBlock.setLevel(fromWaterlogged || down ? 1 : Math.min(levelledFrom.getLevel() + 1, levelledFrom.getMaximumLevel()));
|
newBlock.setLevel(fromWaterlogged || down ? 1 : Math.min(levelledFrom.getLevel() + 1, levelledFrom.getMaximumLevel()));
|
||||||
if (BukkitUtils.isEmpty(typeTo)) {
|
if (BukkitUtils.isEmpty(typeTo)) {
|
||||||
consumer.queueBlockPlace(new Actor("WaterFlow", source), to.getLocation(), newBlock);
|
consumer.queueBlockPlace(new Actor("WaterFlow", source), to.getLocation(), newBlock);
|
||||||
} else if (BukkitUtils.getNonFluidProofBlocks().contains(typeTo)) {
|
} else if (BukkitUtils.getNonFluidProofBlocks().contains(typeTo)) {
|
||||||
consumer.queueBlockReplace(new Actor("WaterFlow", source), to.getState(), newBlock);
|
consumer.queueBlockReplace(new Actor("WaterFlow", source), to.getState(), newBlock);
|
||||||
} else if (typeTo == Material.LAVA) {
|
} else if (typeTo == Material.LAVA) {
|
||||||
int toLevel = ((Levelled) to.getBlockData()).getLevel();
|
int toLevel = ((Levelled) to.getBlockData()).getLevel();
|
||||||
if (toLevel == 0) {
|
if (toLevel == 0) {
|
||||||
consumer.queueBlockReplace(new Actor("WaterFlow", source), to.getState(), Material.OBSIDIAN.createBlockData());
|
consumer.queueBlockReplace(new Actor("WaterFlow", source), to.getState(), Material.OBSIDIAN.createBlockData());
|
||||||
} else if (event.getFace() == BlockFace.DOWN) {
|
} else if (event.getFace() == BlockFace.DOWN) {
|
||||||
consumer.queueBlockReplace(new Actor("WaterFlow", source), to.getState(), Material.STONE.createBlockData());
|
consumer.queueBlockReplace(new Actor("WaterFlow", source), to.getState(), Material.STONE.createBlockData());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (BukkitUtils.isEmpty(typeTo) || BukkitUtils.getNonFluidProofBlocks().contains(typeTo)) {
|
if (BukkitUtils.isEmpty(typeTo) || BukkitUtils.getNonFluidProofBlocks().contains(typeTo)) {
|
||||||
for (final BlockFace face : new BlockFace[] { BlockFace.DOWN, BlockFace.NORTH, BlockFace.WEST, BlockFace.EAST, BlockFace.SOUTH }) {
|
for (final BlockFace face : new BlockFace[] { BlockFace.DOWN, BlockFace.NORTH, BlockFace.WEST, BlockFace.EAST, BlockFace.SOUTH }) {
|
||||||
final Block lower = to.getRelative(face);
|
final Block lower = to.getRelative(face);
|
||||||
if (lower.getType() == Material.LAVA) {
|
if (lower.getType() == Material.LAVA) {
|
||||||
int toLevel = ((Levelled) lower.getBlockData()).getLevel();
|
int toLevel = ((Levelled) lower.getBlockData()).getLevel();
|
||||||
if (toLevel == 0) {
|
if (toLevel == 0) {
|
||||||
consumer.queueBlockReplace(new Actor("WaterFlow", source), lower.getState(), Material.OBSIDIAN.createBlockData());
|
consumer.queueBlockReplace(new Actor("WaterFlow", source), lower.getState(), Material.OBSIDIAN.createBlockData());
|
||||||
} else if (event.getFace() == BlockFace.DOWN) {
|
} else if (event.getFace() == BlockFace.DOWN) {
|
||||||
consumer.queueBlockReplace(new Actor("WaterFlow", source), lower.getState(), Material.STONE.createBlockData());
|
consumer.queueBlockReplace(new Actor("WaterFlow", source), lower.getState(), Material.STONE.createBlockData());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onBlockForm(BlockFormEvent event) {
|
public void onBlockForm(BlockFormEvent event) {
|
||||||
final WorldConfig wcfg = getWorldConfig(event.getBlock().getWorld());
|
final WorldConfig wcfg = getWorldConfig(event.getBlock().getWorld());
|
||||||
if (wcfg != null && (wcfg.isLogging(Logging.WATERFLOW) || wcfg.isLogging(Logging.LAVAFLOW))) {
|
if (wcfg != null && (wcfg.isLogging(Logging.WATERFLOW) || wcfg.isLogging(Logging.LAVAFLOW))) {
|
||||||
if (wcfg.isLogging(Logging.LAVAFLOW) && event.getBlock().getType() == Material.WATER && event.getNewState().getType() == Material.COBBLESTONE) {
|
if (wcfg.isLogging(Logging.LAVAFLOW) && event.getBlock().getType() == Material.WATER && event.getNewState().getType() == Material.COBBLESTONE) {
|
||||||
consumer.queueBlockReplace(new Actor("LavaFlow"), event.getBlock().getBlockData(), event.getNewState());
|
consumer.queueBlockReplace(new Actor("LavaFlow"), event.getBlock().getBlockData(), event.getNewState());
|
||||||
}
|
}
|
||||||
if (wcfg.isLogging(Logging.WATERFLOW) && event.getBlock().getType() == Material.LAVA) {
|
if (wcfg.isLogging(Logging.WATERFLOW) && event.getBlock().getType() == Material.LAVA) {
|
||||||
consumer.queueBlockReplace(new Actor("WaterFlow"), event.getBlock().getBlockData(), event.getNewState());
|
consumer.queueBlockReplace(new Actor("WaterFlow"), event.getBlock().getBlockData(), event.getNewState());
|
||||||
}
|
}
|
||||||
if (wcfg.isLogging(Logging.WATERFLOW) && BukkitUtils.isConcreteBlock(event.getNewState().getType())) {
|
if (wcfg.isLogging(Logging.WATERFLOW) && BukkitUtils.isConcreteBlock(event.getNewState().getType())) {
|
||||||
consumer.queueBlockReplace(new Actor("WaterFlow"), event.getBlock().getBlockData(), event.getNewState());
|
consumer.queueBlockReplace(new Actor("WaterFlow"), event.getBlock().getBlockData(), event.getNewState());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean isSurroundedByWater(Block block) {
|
private static boolean isSurroundedByWater(Block block) {
|
||||||
for (final BlockFace face : new BlockFace[] { BlockFace.NORTH, BlockFace.WEST, BlockFace.EAST, BlockFace.SOUTH }) {
|
for (final BlockFace face : new BlockFace[] { BlockFace.NORTH, BlockFace.WEST, BlockFace.EAST, BlockFace.SOUTH }) {
|
||||||
if (block.getRelative(face).getType() == Material.WATER) {
|
if (block.getRelative(face).getType() == Material.WATER) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,276 +1,276 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.Actor;
|
import de.diddiz.LogBlock.Actor;
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import de.diddiz.LogBlock.Logging;
|
import de.diddiz.LogBlock.Logging;
|
||||||
import de.diddiz.LogBlock.config.WorldConfig;
|
import de.diddiz.LogBlock.config.WorldConfig;
|
||||||
import de.diddiz.LogBlock.util.BukkitUtils;
|
import de.diddiz.LogBlock.util.BukkitUtils;
|
||||||
import de.diddiz.LogBlock.util.Reflections;
|
import de.diddiz.LogBlock.util.Reflections;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import org.bukkit.DyeColor;
|
import org.bukkit.DyeColor;
|
||||||
import org.bukkit.GameEvent;
|
import org.bukkit.GameEvent;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.Note;
|
import org.bukkit.Note;
|
||||||
import org.bukkit.Note.Tone;
|
import org.bukkit.Note.Tone;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.BlockFace;
|
import org.bukkit.block.BlockFace;
|
||||||
import org.bukkit.block.BlockState;
|
import org.bukkit.block.BlockState;
|
||||||
import org.bukkit.block.Sign;
|
import org.bukkit.block.Sign;
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
import org.bukkit.block.data.Directional;
|
import org.bukkit.block.data.Directional;
|
||||||
import org.bukkit.block.data.Lightable;
|
import org.bukkit.block.data.Lightable;
|
||||||
import org.bukkit.block.data.Openable;
|
import org.bukkit.block.data.Openable;
|
||||||
import org.bukkit.block.data.type.Cake;
|
import org.bukkit.block.data.type.Cake;
|
||||||
import org.bukkit.block.data.type.Candle;
|
import org.bukkit.block.data.type.Candle;
|
||||||
import org.bukkit.block.data.type.Comparator;
|
import org.bukkit.block.data.type.Comparator;
|
||||||
import org.bukkit.block.data.type.Comparator.Mode;
|
import org.bukkit.block.data.type.Comparator.Mode;
|
||||||
import org.bukkit.block.data.type.DaylightDetector;
|
import org.bukkit.block.data.type.DaylightDetector;
|
||||||
import org.bukkit.block.data.type.Door;
|
import org.bukkit.block.data.type.Door;
|
||||||
import org.bukkit.block.data.type.NoteBlock;
|
import org.bukkit.block.data.type.NoteBlock;
|
||||||
import org.bukkit.block.data.type.Repeater;
|
import org.bukkit.block.data.type.Repeater;
|
||||||
import org.bukkit.block.data.type.Switch;
|
import org.bukkit.block.data.type.Switch;
|
||||||
import org.bukkit.block.data.type.TurtleEgg;
|
import org.bukkit.block.data.type.TurtleEgg;
|
||||||
import org.bukkit.block.sign.Side;
|
import org.bukkit.block.sign.Side;
|
||||||
import org.bukkit.block.sign.SignSide;
|
import org.bukkit.block.sign.SignSide;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.Event.Result;
|
import org.bukkit.event.Event.Result;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.block.Action;
|
import org.bukkit.event.block.Action;
|
||||||
import org.bukkit.event.player.PlayerInteractEvent;
|
import org.bukkit.event.player.PlayerInteractEvent;
|
||||||
import org.bukkit.event.world.GenericGameEvent;
|
import org.bukkit.event.world.GenericGameEvent;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.getWorldConfig;
|
import static de.diddiz.LogBlock.config.Config.getWorldConfig;
|
||||||
|
|
||||||
public class InteractLogging extends LoggingListener {
|
public class InteractLogging extends LoggingListener {
|
||||||
public InteractLogging(LogBlock lb) {
|
public InteractLogging(LogBlock lb) {
|
||||||
super(lb);
|
super(lb);
|
||||||
}
|
}
|
||||||
|
|
||||||
private UUID lastInteractionPlayer;
|
private UUID lastInteractionPlayer;
|
||||||
private BlockData lastInteractionBlockData;
|
private BlockData lastInteractionBlockData;
|
||||||
private Location lastInteractionLocation;
|
private Location lastInteractionLocation;
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onPlayerInteract(PlayerInteractEvent event) {
|
public void onPlayerInteract(PlayerInteractEvent event) {
|
||||||
final WorldConfig wcfg = getWorldConfig(event.getPlayer().getWorld());
|
final WorldConfig wcfg = getWorldConfig(event.getPlayer().getWorld());
|
||||||
if (wcfg != null) {
|
if (wcfg != null) {
|
||||||
final Block clicked = event.getClickedBlock();
|
final Block clicked = event.getClickedBlock();
|
||||||
if (clicked == null) {
|
if (clicked == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final BlockData blockData = clicked.getBlockData();
|
final BlockData blockData = clicked.getBlockData();
|
||||||
final Material type = blockData.getMaterial();
|
final Material type = blockData.getMaterial();
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
final Location loc = clicked.getLocation();
|
final Location loc = clicked.getLocation();
|
||||||
lastInteractionPlayer = player.getUniqueId();
|
lastInteractionPlayer = player.getUniqueId();
|
||||||
lastInteractionBlockData = blockData;
|
lastInteractionBlockData = blockData;
|
||||||
lastInteractionLocation = loc;
|
lastInteractionLocation = loc;
|
||||||
|
|
||||||
if (BukkitUtils.isFenceGate(type) || BukkitUtils.isWoodenTrapdoor(type)) {
|
if (BukkitUtils.isFenceGate(type) || BukkitUtils.isWoodenTrapdoor(type)) {
|
||||||
if (wcfg.isLogging(Logging.DOORINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
if (wcfg.isLogging(Logging.DOORINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
||||||
Openable newBlockData = (Openable) blockData.clone();
|
Openable newBlockData = (Openable) blockData.clone();
|
||||||
newBlockData.setOpen(!newBlockData.isOpen());
|
newBlockData.setOpen(!newBlockData.isOpen());
|
||||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
||||||
}
|
}
|
||||||
} else if (BukkitUtils.isPressurePlate(type)) {
|
} else if (BukkitUtils.isPressurePlate(type)) {
|
||||||
if (wcfg.isLogging(Logging.PRESUREPLATEINTERACT) && event.getAction() == Action.PHYSICAL) {
|
if (wcfg.isLogging(Logging.PRESUREPLATEINTERACT) && event.getAction() == Action.PHYSICAL) {
|
||||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, blockData);
|
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, blockData);
|
||||||
}
|
}
|
||||||
} else if (BukkitUtils.isWoodenDoor(type)) {
|
} else if (BukkitUtils.isWoodenDoor(type)) {
|
||||||
if (wcfg.isLogging(Logging.DOORINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
if (wcfg.isLogging(Logging.DOORINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
||||||
Door newBlockData = (Door) blockData.clone();
|
Door newBlockData = (Door) blockData.clone();
|
||||||
newBlockData.setOpen(!newBlockData.isOpen());
|
newBlockData.setOpen(!newBlockData.isOpen());
|
||||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
||||||
}
|
}
|
||||||
} else if (BukkitUtils.isButton(type) || type == Material.LEVER) {
|
} else if (BukkitUtils.isButton(type) || type == Material.LEVER) {
|
||||||
if (wcfg.isLogging(Logging.SWITCHINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
if (wcfg.isLogging(Logging.SWITCHINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
||||||
Switch newBlockData = (Switch) blockData.clone();
|
Switch newBlockData = (Switch) blockData.clone();
|
||||||
if (!newBlockData.isPowered() || type == Material.LEVER) {
|
if (!newBlockData.isPowered() || type == Material.LEVER) {
|
||||||
newBlockData.setPowered(!newBlockData.isPowered());
|
newBlockData.setPowered(!newBlockData.isPowered());
|
||||||
}
|
}
|
||||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
||||||
}
|
}
|
||||||
} else if (BukkitUtils.isSign(type)) {
|
} else if (BukkitUtils.isSign(type)) {
|
||||||
if (wcfg.isLogging(Logging.SIGNTEXT) && event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getItem() != null) {
|
if (wcfg.isLogging(Logging.SIGNTEXT) && event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getItem() != null) {
|
||||||
Material itemType = event.getItem().getType();
|
Material itemType = event.getItem().getType();
|
||||||
if (BukkitUtils.isDye(itemType) || itemType == Material.GLOW_INK_SAC || itemType == Material.INK_SAC || itemType == Material.HONEYCOMB) {
|
if (BukkitUtils.isDye(itemType) || itemType == Material.GLOW_INK_SAC || itemType == Material.INK_SAC || itemType == Material.HONEYCOMB) {
|
||||||
final BlockState before = event.getClickedBlock().getState();
|
final BlockState before = event.getClickedBlock().getState();
|
||||||
if (before instanceof Sign signBefore) {
|
if (before instanceof Sign signBefore) {
|
||||||
boolean waxed = Reflections.isSignWaxed(signBefore);
|
boolean waxed = Reflections.isSignWaxed(signBefore);
|
||||||
if (!waxed) {
|
if (!waxed) {
|
||||||
final Sign signAfter = (Sign) event.getClickedBlock().getState();
|
final Sign signAfter = (Sign) event.getClickedBlock().getState();
|
||||||
Side side = BukkitUtils.getFacingSignSide(player, clicked);
|
Side side = BukkitUtils.getFacingSignSide(player, clicked);
|
||||||
SignSide signSideBefore = signBefore.getSide(side);
|
SignSide signSideBefore = signBefore.getSide(side);
|
||||||
SignSide signSideAfter = signAfter.getSide(side);
|
SignSide signSideAfter = signAfter.getSide(side);
|
||||||
if (itemType == Material.GLOW_INK_SAC) {
|
if (itemType == Material.GLOW_INK_SAC) {
|
||||||
if (!signSideBefore.isGlowingText() && hasText(signSideBefore)) {
|
if (!signSideBefore.isGlowingText() && hasText(signSideBefore)) {
|
||||||
signSideAfter.setGlowingText(true);
|
signSideAfter.setGlowingText(true);
|
||||||
consumer.queueBlockReplace(Actor.actorFromEntity(player), signBefore, signAfter);
|
consumer.queueBlockReplace(Actor.actorFromEntity(player), signBefore, signAfter);
|
||||||
}
|
}
|
||||||
} else if (itemType == Material.INK_SAC) {
|
} else if (itemType == Material.INK_SAC) {
|
||||||
if (signSideBefore.isGlowingText() && hasText(signSideBefore)) {
|
if (signSideBefore.isGlowingText() && hasText(signSideBefore)) {
|
||||||
signSideAfter.setGlowingText(false);
|
signSideAfter.setGlowingText(false);
|
||||||
consumer.queueBlockReplace(Actor.actorFromEntity(player), signBefore, signAfter);
|
consumer.queueBlockReplace(Actor.actorFromEntity(player), signBefore, signAfter);
|
||||||
}
|
}
|
||||||
} else if (itemType == Material.HONEYCOMB) {
|
} else if (itemType == Material.HONEYCOMB) {
|
||||||
signAfter.setEditable(false);
|
signAfter.setEditable(false);
|
||||||
consumer.queueBlockReplace(Actor.actorFromEntity(player), signBefore, signAfter);
|
consumer.queueBlockReplace(Actor.actorFromEntity(player), signBefore, signAfter);
|
||||||
} else if (BukkitUtils.isDye(itemType) && hasText(signSideBefore)) {
|
} else if (BukkitUtils.isDye(itemType) && hasText(signSideBefore)) {
|
||||||
DyeColor newColor = BukkitUtils.dyeToDyeColor(itemType);
|
DyeColor newColor = BukkitUtils.dyeToDyeColor(itemType);
|
||||||
if (newColor != null && signSideBefore.getColor() != newColor) {
|
if (newColor != null && signSideBefore.getColor() != newColor) {
|
||||||
signSideAfter.setColor(newColor);
|
signSideAfter.setColor(newColor);
|
||||||
consumer.queueBlockReplace(Actor.actorFromEntity(player), signBefore, signAfter);
|
consumer.queueBlockReplace(Actor.actorFromEntity(player), signBefore, signAfter);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (type == Material.CAKE) {
|
} else if (type == Material.CAKE) {
|
||||||
if (event.hasItem() && BukkitUtils.isCandle(event.getItem().getType()) && event.useItemInHand() != Result.DENY) {
|
if (event.hasItem() && BukkitUtils.isCandle(event.getItem().getType()) && event.useItemInHand() != Result.DENY) {
|
||||||
BlockData newBlockData = Material.valueOf(event.getItem().getType().name() + "_CAKE").createBlockData();
|
BlockData newBlockData = Material.valueOf(event.getItem().getType().name() + "_CAKE").createBlockData();
|
||||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
||||||
} else if (wcfg.isLogging(Logging.CAKEEAT) && event.getAction() == Action.RIGHT_CLICK_BLOCK && player.getFoodLevel() < 20) {
|
} else if (wcfg.isLogging(Logging.CAKEEAT) && event.getAction() == Action.RIGHT_CLICK_BLOCK && player.getFoodLevel() < 20) {
|
||||||
Cake newBlockData = (Cake) blockData.clone();
|
Cake newBlockData = (Cake) blockData.clone();
|
||||||
if (newBlockData.getBites() < 6) {
|
if (newBlockData.getBites() < 6) {
|
||||||
newBlockData.setBites(newBlockData.getBites() + 1);
|
newBlockData.setBites(newBlockData.getBites() + 1);
|
||||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
||||||
} else {
|
} else {
|
||||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, Material.AIR.createBlockData());
|
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, Material.AIR.createBlockData());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (type == Material.NOTE_BLOCK) {
|
} else if (type == Material.NOTE_BLOCK) {
|
||||||
if (wcfg.isLogging(Logging.NOTEBLOCKINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
if (wcfg.isLogging(Logging.NOTEBLOCKINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
||||||
NoteBlock newBlockData = (NoteBlock) blockData.clone();
|
NoteBlock newBlockData = (NoteBlock) blockData.clone();
|
||||||
if (newBlockData.getNote().getOctave() == 2) {
|
if (newBlockData.getNote().getOctave() == 2) {
|
||||||
newBlockData.setNote(new Note(0, Tone.F, true));
|
newBlockData.setNote(new Note(0, Tone.F, true));
|
||||||
} else {
|
} else {
|
||||||
newBlockData.setNote(newBlockData.getNote().sharped());
|
newBlockData.setNote(newBlockData.getNote().sharped());
|
||||||
}
|
}
|
||||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
||||||
}
|
}
|
||||||
} else if (type == Material.REPEATER) {
|
} else if (type == Material.REPEATER) {
|
||||||
if (wcfg.isLogging(Logging.DIODEINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
if (wcfg.isLogging(Logging.DIODEINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
||||||
Repeater newBlockData = (Repeater) blockData.clone();
|
Repeater newBlockData = (Repeater) blockData.clone();
|
||||||
newBlockData.setDelay((newBlockData.getDelay() % 4) + 1);
|
newBlockData.setDelay((newBlockData.getDelay() % 4) + 1);
|
||||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
||||||
}
|
}
|
||||||
} else if (type == Material.COMPARATOR) {
|
} else if (type == Material.COMPARATOR) {
|
||||||
if (wcfg.isLogging(Logging.COMPARATORINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
if (wcfg.isLogging(Logging.COMPARATORINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
||||||
Comparator newBlockData = (Comparator) blockData.clone();
|
Comparator newBlockData = (Comparator) blockData.clone();
|
||||||
newBlockData.setMode(newBlockData.getMode() == Mode.COMPARE ? Mode.SUBTRACT : Mode.COMPARE);
|
newBlockData.setMode(newBlockData.getMode() == Mode.COMPARE ? Mode.SUBTRACT : Mode.COMPARE);
|
||||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
||||||
}
|
}
|
||||||
} else if (type == Material.DAYLIGHT_DETECTOR) {
|
} else if (type == Material.DAYLIGHT_DETECTOR) {
|
||||||
if (wcfg.isLogging(Logging.DAYLIGHTDETECTORINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
if (wcfg.isLogging(Logging.DAYLIGHTDETECTORINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
||||||
DaylightDetector newBlockData = (DaylightDetector) blockData.clone();
|
DaylightDetector newBlockData = (DaylightDetector) blockData.clone();
|
||||||
newBlockData.setInverted(!newBlockData.isInverted());
|
newBlockData.setInverted(!newBlockData.isInverted());
|
||||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
||||||
}
|
}
|
||||||
} else if (type == Material.TRIPWIRE) {
|
} else if (type == Material.TRIPWIRE) {
|
||||||
if (wcfg.isLogging(Logging.TRIPWIREINTERACT) && event.getAction() == Action.PHYSICAL) {
|
if (wcfg.isLogging(Logging.TRIPWIREINTERACT) && event.getAction() == Action.PHYSICAL) {
|
||||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, blockData);
|
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, blockData);
|
||||||
}
|
}
|
||||||
} else if (type == Material.FARMLAND) {
|
} else if (type == Material.FARMLAND) {
|
||||||
if (wcfg.isLogging(Logging.CROPTRAMPLE) && event.getAction() == Action.PHYSICAL) {
|
if (wcfg.isLogging(Logging.CROPTRAMPLE) && event.getAction() == Action.PHYSICAL) {
|
||||||
// 3 = Dirt ID
|
// 3 = Dirt ID
|
||||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, Material.DIRT.createBlockData());
|
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, Material.DIRT.createBlockData());
|
||||||
// Log the crop on top as being broken
|
// Log the crop on top as being broken
|
||||||
Block trampledCrop = clicked.getRelative(BlockFace.UP);
|
Block trampledCrop = clicked.getRelative(BlockFace.UP);
|
||||||
if (BukkitUtils.getCropBlocks().contains(trampledCrop.getType())) {
|
if (BukkitUtils.getCropBlocks().contains(trampledCrop.getType())) {
|
||||||
consumer.queueBlockBreak(Actor.actorFromEntity(player), trampledCrop.getState());
|
consumer.queueBlockBreak(Actor.actorFromEntity(player), trampledCrop.getState());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (type == Material.TURTLE_EGG) {
|
} else if (type == Material.TURTLE_EGG) {
|
||||||
if (wcfg.isLogging(Logging.BLOCKBREAK) && event.getAction() == Action.PHYSICAL) {
|
if (wcfg.isLogging(Logging.BLOCKBREAK) && event.getAction() == Action.PHYSICAL) {
|
||||||
TurtleEgg turtleEggData = (TurtleEgg) blockData;
|
TurtleEgg turtleEggData = (TurtleEgg) blockData;
|
||||||
int eggs = turtleEggData.getEggs();
|
int eggs = turtleEggData.getEggs();
|
||||||
if (eggs > 1) {
|
if (eggs > 1) {
|
||||||
TurtleEgg turtleEggData2 = (TurtleEgg) turtleEggData.clone();
|
TurtleEgg turtleEggData2 = (TurtleEgg) turtleEggData.clone();
|
||||||
turtleEggData2.setEggs(eggs - 1);
|
turtleEggData2.setEggs(eggs - 1);
|
||||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, turtleEggData, turtleEggData2);
|
consumer.queueBlock(Actor.actorFromEntity(player), loc, turtleEggData, turtleEggData2);
|
||||||
} else {
|
} else {
|
||||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, turtleEggData, Material.AIR.createBlockData());
|
consumer.queueBlock(Actor.actorFromEntity(player), loc, turtleEggData, Material.AIR.createBlockData());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (type == Material.PUMPKIN) {
|
} else if (type == Material.PUMPKIN) {
|
||||||
if ((wcfg.isLogging(Logging.BLOCKBREAK) || wcfg.isLogging(Logging.BLOCKPLACE)) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
if ((wcfg.isLogging(Logging.BLOCKBREAK) || wcfg.isLogging(Logging.BLOCKPLACE)) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
||||||
ItemStack inHand = event.getItem();
|
ItemStack inHand = event.getItem();
|
||||||
if (inHand != null && inHand.getType() == Material.SHEARS) {
|
if (inHand != null && inHand.getType() == Material.SHEARS) {
|
||||||
BlockFace clickedFace = event.getBlockFace();
|
BlockFace clickedFace = event.getBlockFace();
|
||||||
Directional newBlockData = (Directional) Material.CARVED_PUMPKIN.createBlockData();
|
Directional newBlockData = (Directional) Material.CARVED_PUMPKIN.createBlockData();
|
||||||
if (clickedFace == BlockFace.NORTH || clickedFace == BlockFace.SOUTH || clickedFace == BlockFace.EAST || clickedFace == BlockFace.WEST) {
|
if (clickedFace == BlockFace.NORTH || clickedFace == BlockFace.SOUTH || clickedFace == BlockFace.EAST || clickedFace == BlockFace.WEST) {
|
||||||
newBlockData.setFacing(clickedFace);
|
newBlockData.setFacing(clickedFace);
|
||||||
} else {
|
} else {
|
||||||
// use player distance to calculate the facing
|
// use player distance to calculate the facing
|
||||||
Location playerLoc = player.getLocation();
|
Location playerLoc = player.getLocation();
|
||||||
playerLoc.subtract(0.5, 0, 0.5);
|
playerLoc.subtract(0.5, 0, 0.5);
|
||||||
double dx = playerLoc.getX() - loc.getX();
|
double dx = playerLoc.getX() - loc.getX();
|
||||||
double dz = playerLoc.getZ() - loc.getZ();
|
double dz = playerLoc.getZ() - loc.getZ();
|
||||||
if (Math.abs(dx) > Math.abs(dz)) {
|
if (Math.abs(dx) > Math.abs(dz)) {
|
||||||
newBlockData.setFacing(dx > 0 ? BlockFace.EAST : BlockFace.WEST);
|
newBlockData.setFacing(dx > 0 ? BlockFace.EAST : BlockFace.WEST);
|
||||||
} else {
|
} else {
|
||||||
newBlockData.setFacing(dz > 0 ? BlockFace.SOUTH : BlockFace.NORTH);
|
newBlockData.setFacing(dz > 0 ? BlockFace.SOUTH : BlockFace.NORTH);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean hasText(SignSide signSide) {
|
private boolean hasText(SignSide signSide) {
|
||||||
for (int i = 0; i < 4; i++) {
|
for (int i = 0; i < 4; i++) {
|
||||||
if (!signSide.getLine(i).isEmpty()) {
|
if (!signSide.getLine(i).isEmpty()) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onGenericGameEvent(GenericGameEvent event) {
|
public void onGenericGameEvent(GenericGameEvent event) {
|
||||||
if (lastInteractionPlayer != null && event.getEntity() != null && event.getEntity().getUniqueId().equals(lastInteractionPlayer) && lastInteractionLocation != null && event.getLocation().equals(lastInteractionLocation)) {
|
if (lastInteractionPlayer != null && event.getEntity() != null && event.getEntity().getUniqueId().equals(lastInteractionPlayer) && lastInteractionLocation != null && event.getLocation().equals(lastInteractionLocation)) {
|
||||||
if (lastInteractionBlockData instanceof Candle) {
|
if (lastInteractionBlockData instanceof Candle) {
|
||||||
Candle previousCandle = (Candle) lastInteractionBlockData;
|
Candle previousCandle = (Candle) lastInteractionBlockData;
|
||||||
if (previousCandle.isLit()) {
|
if (previousCandle.isLit()) {
|
||||||
BlockData newData = lastInteractionLocation.getBlock().getBlockData();
|
BlockData newData = lastInteractionLocation.getBlock().getBlockData();
|
||||||
if (newData instanceof Candle) {
|
if (newData instanceof Candle) {
|
||||||
Candle newCandle = (Candle) newData;
|
Candle newCandle = (Candle) newData;
|
||||||
if (!newCandle.isLit() && !newCandle.isWaterlogged()) {
|
if (!newCandle.isLit() && !newCandle.isWaterlogged()) {
|
||||||
// log candle extinguish
|
// log candle extinguish
|
||||||
consumer.queueBlockReplace(Actor.actorFromEntity(event.getEntity()), lastInteractionLocation, lastInteractionBlockData, newData);
|
consumer.queueBlockReplace(Actor.actorFromEntity(event.getEntity()), lastInteractionLocation, lastInteractionBlockData, newData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (lastInteractionBlockData instanceof Lightable && BukkitUtils.isCandleCake(lastInteractionBlockData.getMaterial())) {
|
} else if (lastInteractionBlockData instanceof Lightable && BukkitUtils.isCandleCake(lastInteractionBlockData.getMaterial())) {
|
||||||
Lightable previousLightable = (Lightable) lastInteractionBlockData;
|
Lightable previousLightable = (Lightable) lastInteractionBlockData;
|
||||||
BlockData newData = lastInteractionLocation.getBlock().getBlockData();
|
BlockData newData = lastInteractionLocation.getBlock().getBlockData();
|
||||||
if (event.getEvent().equals(GameEvent.EAT)) {
|
if (event.getEvent().equals(GameEvent.EAT)) {
|
||||||
final WorldConfig wcfg = getWorldConfig(event.getLocation().getWorld());
|
final WorldConfig wcfg = getWorldConfig(event.getLocation().getWorld());
|
||||||
if (wcfg.isLogging(Logging.CAKEEAT)) {
|
if (wcfg.isLogging(Logging.CAKEEAT)) {
|
||||||
// nom nom (don't know why newData is incorrect here)
|
// nom nom (don't know why newData is incorrect here)
|
||||||
newData = Material.CAKE.createBlockData();
|
newData = Material.CAKE.createBlockData();
|
||||||
((Cake) newData).setBites(1);
|
((Cake) newData).setBites(1);
|
||||||
consumer.queueBlockReplace(Actor.actorFromEntity(event.getEntity()), lastInteractionLocation, lastInteractionBlockData, newData);
|
consumer.queueBlockReplace(Actor.actorFromEntity(event.getEntity()), lastInteractionLocation, lastInteractionBlockData, newData);
|
||||||
}
|
}
|
||||||
} else if (previousLightable.isLit()) {
|
} else if (previousLightable.isLit()) {
|
||||||
if (newData instanceof Lightable) {
|
if (newData instanceof Lightable) {
|
||||||
Lightable newLightable = (Lightable) newData;
|
Lightable newLightable = (Lightable) newData;
|
||||||
if (!newLightable.isLit()) {
|
if (!newLightable.isLit()) {
|
||||||
// log cake extinguish
|
// log cake extinguish
|
||||||
consumer.queueBlockReplace(Actor.actorFromEntity(event.getEntity()), lastInteractionLocation, lastInteractionBlockData, newData);
|
consumer.queueBlockReplace(Actor.actorFromEntity(event.getEntity()), lastInteractionLocation, lastInteractionBlockData, newData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
lastInteractionPlayer = null;
|
lastInteractionPlayer = null;
|
||||||
lastInteractionBlockData = null;
|
lastInteractionBlockData = null;
|
||||||
lastInteractionLocation = null;
|
lastInteractionLocation = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,51 +1,51 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.Actor;
|
import de.diddiz.LogBlock.Actor;
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import de.diddiz.LogBlock.Logging;
|
import de.diddiz.LogBlock.Logging;
|
||||||
import de.diddiz.LogBlock.config.Config.*;
|
import de.diddiz.LogBlock.config.Config.*;
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
import org.bukkit.entity.LivingEntity;
|
import org.bukkit.entity.LivingEntity;
|
||||||
import org.bukkit.entity.Monster;
|
import org.bukkit.entity.Monster;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||||
import org.bukkit.event.entity.EntityDamageEvent;
|
import org.bukkit.event.entity.EntityDamageEvent;
|
||||||
import org.bukkit.event.entity.EntityDeathEvent;
|
import org.bukkit.event.entity.EntityDeathEvent;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.*;
|
import static de.diddiz.LogBlock.config.Config.*;
|
||||||
|
|
||||||
public class KillLogging extends LoggingListener {
|
public class KillLogging extends LoggingListener {
|
||||||
|
|
||||||
public KillLogging(LogBlock lb) {
|
public KillLogging(LogBlock lb) {
|
||||||
super(lb);
|
super(lb);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onEntityDeath(EntityDeathEvent deathEvent) {
|
public void onEntityDeath(EntityDeathEvent deathEvent) {
|
||||||
EntityDamageEvent event = deathEvent.getEntity().getLastDamageCause();
|
EntityDamageEvent event = deathEvent.getEntity().getLastDamageCause();
|
||||||
// For a death event, there should always be a damage event and it should not be cancelled. Check anyway.
|
// For a death event, there should always be a damage event and it should not be cancelled. Check anyway.
|
||||||
if (event != null && event.isCancelled() == false && isLogging(event.getEntity().getWorld(), Logging.KILL) && event.getEntity() instanceof LivingEntity) {
|
if (event != null && event.isCancelled() == false && isLogging(event.getEntity().getWorld(), Logging.KILL) && event.getEntity() instanceof LivingEntity) {
|
||||||
final LivingEntity victim = (LivingEntity) event.getEntity();
|
final LivingEntity victim = (LivingEntity) event.getEntity();
|
||||||
if (event instanceof EntityDamageByEntityEvent) {
|
if (event instanceof EntityDamageByEntityEvent) {
|
||||||
final Entity killer = ((EntityDamageByEntityEvent) event).getDamager();
|
final Entity killer = ((EntityDamageByEntityEvent) event).getDamager();
|
||||||
if (logKillsLevel == LogKillsLevel.PLAYERS && !(victim instanceof Player && killer instanceof Player)) {
|
if (logKillsLevel == LogKillsLevel.PLAYERS && !(victim instanceof Player && killer instanceof Player)) {
|
||||||
return;
|
return;
|
||||||
} else if (logKillsLevel == LogKillsLevel.MONSTERS && !((victim instanceof Player || victim instanceof Monster) && killer instanceof Player || killer instanceof Monster)) {
|
} else if (logKillsLevel == LogKillsLevel.MONSTERS && !((victim instanceof Player || victim instanceof Monster) && killer instanceof Player || killer instanceof Monster)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
consumer.queueKill(killer, victim);
|
consumer.queueKill(killer, victim);
|
||||||
} else if (deathEvent.getEntity().getKiller() != null) {
|
} else if (deathEvent.getEntity().getKiller() != null) {
|
||||||
consumer.queueKill(deathEvent.getEntity().getKiller(), victim);
|
consumer.queueKill(deathEvent.getEntity().getKiller(), victim);
|
||||||
} else if (logEnvironmentalKills) {
|
} else if (logEnvironmentalKills) {
|
||||||
if (logKillsLevel == LogKillsLevel.PLAYERS && !(victim instanceof Player)) {
|
if (logKillsLevel == LogKillsLevel.PLAYERS && !(victim instanceof Player)) {
|
||||||
return;
|
return;
|
||||||
} else if (logKillsLevel == LogKillsLevel.MONSTERS && !((victim instanceof Player || victim instanceof Monster))) {
|
} else if (logKillsLevel == LogKillsLevel.MONSTERS && !((victim instanceof Player || victim instanceof Monster))) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
consumer.queueKill(new Actor(event.getCause().toString()), victim);
|
consumer.queueKill(new Actor(event.getCause().toString()), victim);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,26 +1,26 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.Actor;
|
import de.diddiz.LogBlock.Actor;
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import de.diddiz.LogBlock.Logging;
|
import de.diddiz.LogBlock.Logging;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.block.LeavesDecayEvent;
|
import org.bukkit.event.block.LeavesDecayEvent;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.isLogging;
|
import static de.diddiz.LogBlock.config.Config.isLogging;
|
||||||
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockBreak;
|
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockBreak;
|
||||||
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogFallables;
|
import static de.diddiz.LogBlock.util.LoggingUtil.smartLogFallables;
|
||||||
|
|
||||||
public class LeavesDecayLogging extends LoggingListener {
|
public class LeavesDecayLogging extends LoggingListener {
|
||||||
public LeavesDecayLogging(LogBlock lb) {
|
public LeavesDecayLogging(LogBlock lb) {
|
||||||
super(lb);
|
super(lb);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onLeavesDecay(LeavesDecayEvent event) {
|
public void onLeavesDecay(LeavesDecayEvent event) {
|
||||||
if (isLogging(event.getBlock().getWorld(), Logging.LEAVESDECAY)) {
|
if (isLogging(event.getBlock().getWorld(), Logging.LEAVESDECAY)) {
|
||||||
smartLogBlockBreak(consumer, new Actor("LeavesDecay"), event.getBlock());
|
smartLogBlockBreak(consumer, new Actor("LeavesDecay"), event.getBlock());
|
||||||
smartLogFallables(consumer, new Actor("LeavesDecay"), event.getBlock());
|
smartLogFallables(consumer, new Actor("LeavesDecay"), event.getBlock());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.Consumer;
|
import de.diddiz.LogBlock.Consumer;
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
|
|
||||||
public class LoggingListener implements Listener {
|
public class LoggingListener implements Listener {
|
||||||
protected final Consumer consumer;
|
protected final Consumer consumer;
|
||||||
|
|
||||||
public LoggingListener(LogBlock lb) {
|
public LoggingListener(LogBlock lb) {
|
||||||
consumer = lb.getConsumer();
|
consumer = lb.getConsumer();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,43 +1,43 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import de.diddiz.LogBlock.config.Config;
|
import de.diddiz.LogBlock.config.Config;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.player.PlayerJoinEvent;
|
import org.bukkit.event.player.PlayerJoinEvent;
|
||||||
import org.bukkit.event.player.PlayerQuitEvent;
|
import org.bukkit.event.player.PlayerQuitEvent;
|
||||||
|
|
||||||
public class PlayerInfoLogging extends LoggingListener {
|
public class PlayerInfoLogging extends LoggingListener {
|
||||||
|
|
||||||
private final HashMap<UUID, Long> playerLogins = new HashMap<>();
|
private final HashMap<UUID, Long> playerLogins = new HashMap<>();
|
||||||
|
|
||||||
public PlayerInfoLogging(LogBlock lb) {
|
public PlayerInfoLogging(LogBlock lb) {
|
||||||
super(lb);
|
super(lb);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR)
|
@EventHandler(priority = EventPriority.MONITOR)
|
||||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
public void onPlayerJoin(PlayerJoinEvent event) {
|
||||||
playerLogins.put(event.getPlayer().getUniqueId(), System.currentTimeMillis());
|
playerLogins.put(event.getPlayer().getUniqueId(), System.currentTimeMillis());
|
||||||
consumer.queueJoin(event.getPlayer());
|
consumer.queueJoin(event.getPlayer());
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR)
|
@EventHandler(priority = EventPriority.MONITOR)
|
||||||
public void onPlayerQuit(PlayerQuitEvent event) {
|
public void onPlayerQuit(PlayerQuitEvent event) {
|
||||||
onPlayerQuit(event.getPlayer());
|
onPlayerQuit(event.getPlayer());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onPlayerQuit(Player player) {
|
public void onPlayerQuit(Player player) {
|
||||||
Long joinTime = playerLogins.remove(player.getUniqueId());
|
Long joinTime = playerLogins.remove(player.getUniqueId());
|
||||||
if (Config.logPlayerInfo && joinTime != null) {
|
if (Config.logPlayerInfo && joinTime != null) {
|
||||||
long onlineTime = (System.currentTimeMillis() - joinTime) / 1000;
|
long onlineTime = (System.currentTimeMillis() - joinTime) / 1000;
|
||||||
if (onlineTime > 0) {
|
if (onlineTime > 0) {
|
||||||
consumer.queueLeave(player, onlineTime);
|
consumer.queueLeave(player, onlineTime);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,33 +1,33 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.Actor;
|
import de.diddiz.LogBlock.Actor;
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import de.diddiz.LogBlock.Logging;
|
import de.diddiz.LogBlock.Logging;
|
||||||
import org.bukkit.block.BlockState;
|
import org.bukkit.block.BlockState;
|
||||||
import org.bukkit.block.Sign;
|
import org.bukkit.block.Sign;
|
||||||
import org.bukkit.block.sign.SignSide;
|
import org.bukkit.block.sign.SignSide;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.block.SignChangeEvent;
|
import org.bukkit.event.block.SignChangeEvent;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.isLogging;
|
import static de.diddiz.LogBlock.config.Config.isLogging;
|
||||||
|
|
||||||
public class SignChangeLogging extends LoggingListener {
|
public class SignChangeLogging extends LoggingListener {
|
||||||
public SignChangeLogging(LogBlock lb) {
|
public SignChangeLogging(LogBlock lb) {
|
||||||
super(lb);
|
super(lb);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onSignChange(SignChangeEvent event) {
|
public void onSignChange(SignChangeEvent event) {
|
||||||
if (isLogging(event.getBlock().getWorld(), Logging.SIGNTEXT)) {
|
if (isLogging(event.getBlock().getWorld(), Logging.SIGNTEXT)) {
|
||||||
BlockState newState = event.getBlock().getState();
|
BlockState newState = event.getBlock().getState();
|
||||||
if (newState instanceof Sign sign) {
|
if (newState instanceof Sign sign) {
|
||||||
SignSide signSide = sign.getSide(event.getSide());
|
SignSide signSide = sign.getSide(event.getSide());
|
||||||
for (int i = 0; i < 4; i++) {
|
for (int i = 0; i < 4; i++) {
|
||||||
signSide.setLine(i, event.getLine(i));
|
signSide.setLine(i, event.getLine(i));
|
||||||
}
|
}
|
||||||
consumer.queueBlockReplace(Actor.actorFromEntity(event.getPlayer()), event.getBlock().getState(), newState);
|
consumer.queueBlockReplace(Actor.actorFromEntity(event.getPlayer()), event.getBlock().getState(), newState);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,28 +1,28 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.Actor;
|
import de.diddiz.LogBlock.Actor;
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import de.diddiz.LogBlock.Logging;
|
import de.diddiz.LogBlock.Logging;
|
||||||
|
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.block.BlockFadeEvent;
|
import org.bukkit.event.block.BlockFadeEvent;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.isLogging;
|
import static de.diddiz.LogBlock.config.Config.isLogging;
|
||||||
|
|
||||||
public class SnowFadeLogging extends LoggingListener {
|
public class SnowFadeLogging extends LoggingListener {
|
||||||
public SnowFadeLogging(LogBlock lb) {
|
public SnowFadeLogging(LogBlock lb) {
|
||||||
super(lb);
|
super(lb);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onBlockFade(BlockFadeEvent event) {
|
public void onBlockFade(BlockFadeEvent event) {
|
||||||
if (isLogging(event.getBlock().getWorld(), Logging.SNOWFADE)) {
|
if (isLogging(event.getBlock().getWorld(), Logging.SNOWFADE)) {
|
||||||
final Material type = event.getBlock().getType();
|
final Material type = event.getBlock().getType();
|
||||||
if (type == Material.SNOW || type == Material.ICE) {
|
if (type == Material.SNOW || type == Material.ICE) {
|
||||||
consumer.queueBlockReplace(new Actor("SnowFade"), event.getBlock().getState(), event.getNewState());
|
consumer.queueBlockReplace(new Actor("SnowFade"), event.getBlock().getState(), event.getNewState());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,28 +1,28 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.Actor;
|
import de.diddiz.LogBlock.Actor;
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import de.diddiz.LogBlock.Logging;
|
import de.diddiz.LogBlock.Logging;
|
||||||
|
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.block.BlockFormEvent;
|
import org.bukkit.event.block.BlockFormEvent;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.isLogging;
|
import static de.diddiz.LogBlock.config.Config.isLogging;
|
||||||
|
|
||||||
public class SnowFormLogging extends LoggingListener {
|
public class SnowFormLogging extends LoggingListener {
|
||||||
public SnowFormLogging(LogBlock lb) {
|
public SnowFormLogging(LogBlock lb) {
|
||||||
super(lb);
|
super(lb);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onBlockForm(BlockFormEvent event) {
|
public void onBlockForm(BlockFormEvent event) {
|
||||||
if (isLogging(event.getBlock().getWorld(), Logging.SNOWFORM)) {
|
if (isLogging(event.getBlock().getWorld(), Logging.SNOWFORM)) {
|
||||||
final Material type = event.getNewState().getType();
|
final Material type = event.getNewState().getType();
|
||||||
if (type == Material.SNOW || type == Material.ICE) {
|
if (type == Material.SNOW || type == Material.ICE) {
|
||||||
consumer.queueBlockReplace(new Actor("SnowForm"), event.getBlock().getState(), event.getNewState());
|
consumer.queueBlockReplace(new Actor("SnowForm"), event.getBlock().getState(), event.getNewState());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,34 +1,34 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.Actor;
|
import de.diddiz.LogBlock.Actor;
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import de.diddiz.LogBlock.Logging;
|
import de.diddiz.LogBlock.Logging;
|
||||||
import de.diddiz.LogBlock.config.WorldConfig;
|
import de.diddiz.LogBlock.config.WorldConfig;
|
||||||
import org.bukkit.block.BlockState;
|
import org.bukkit.block.BlockState;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.world.StructureGrowEvent;
|
import org.bukkit.event.world.StructureGrowEvent;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.getWorldConfig;
|
import static de.diddiz.LogBlock.config.Config.getWorldConfig;
|
||||||
|
|
||||||
public class StructureGrowLogging extends LoggingListener {
|
public class StructureGrowLogging extends LoggingListener {
|
||||||
public StructureGrowLogging(LogBlock lb) {
|
public StructureGrowLogging(LogBlock lb) {
|
||||||
super(lb);
|
super(lb);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onStructureGrow(StructureGrowEvent event) {
|
public void onStructureGrow(StructureGrowEvent event) {
|
||||||
final WorldConfig wcfg = getWorldConfig(event.getWorld());
|
final WorldConfig wcfg = getWorldConfig(event.getWorld());
|
||||||
if (wcfg != null) {
|
if (wcfg != null) {
|
||||||
if (!wcfg.isLogging(Logging.NATURALSTRUCTUREGROW)) {
|
if (!wcfg.isLogging(Logging.NATURALSTRUCTUREGROW)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!event.isFromBonemeal()) {
|
if (!event.isFromBonemeal()) {
|
||||||
final Actor actor = new Actor("NaturalGrow");
|
final Actor actor = new Actor("NaturalGrow");
|
||||||
for (final BlockState state : event.getBlocks()) {
|
for (final BlockState state : event.getBlocks()) {
|
||||||
consumer.queueBlockReplace(actor, state.getBlock().getState(), state);
|
consumer.queueBlockReplace(actor, state.getBlock().getState(), state);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,151 +1,151 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.*;
|
import de.diddiz.LogBlock.*;
|
||||||
import de.diddiz.LogBlock.events.ToolUseEvent;
|
import de.diddiz.LogBlock.events.ToolUseEvent;
|
||||||
import de.diddiz.LogBlock.util.BukkitUtils;
|
import de.diddiz.LogBlock.util.BukkitUtils;
|
||||||
import de.diddiz.LogBlock.util.CuboidRegion;
|
import de.diddiz.LogBlock.util.CuboidRegion;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.block.Action;
|
import org.bukkit.event.block.Action;
|
||||||
import org.bukkit.event.player.PlayerChangedWorldEvent;
|
import org.bukkit.event.player.PlayerChangedWorldEvent;
|
||||||
import org.bukkit.event.player.PlayerDropItemEvent;
|
import org.bukkit.event.player.PlayerDropItemEvent;
|
||||||
import org.bukkit.event.player.PlayerInteractEvent;
|
import org.bukkit.event.player.PlayerInteractEvent;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.Session.getSession;
|
import static de.diddiz.LogBlock.Session.getSession;
|
||||||
import static de.diddiz.LogBlock.Session.hasSession;
|
import static de.diddiz.LogBlock.Session.hasSession;
|
||||||
import static de.diddiz.LogBlock.config.Config.isLogged;
|
import static de.diddiz.LogBlock.config.Config.isLogged;
|
||||||
import static de.diddiz.LogBlock.config.Config.toolsByType;
|
import static de.diddiz.LogBlock.config.Config.toolsByType;
|
||||||
|
|
||||||
public class ToolListener implements Listener {
|
public class ToolListener implements Listener {
|
||||||
private final CommandsHandler handler;
|
private final CommandsHandler handler;
|
||||||
private final LogBlock logblock;
|
private final LogBlock logblock;
|
||||||
|
|
||||||
public ToolListener(LogBlock logblock) {
|
public ToolListener(LogBlock logblock) {
|
||||||
this.logblock = logblock;
|
this.logblock = logblock;
|
||||||
handler = logblock.getCommandsHandler();
|
handler = logblock.getCommandsHandler();
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPlayerInteract(PlayerInteractEvent event) {
|
public void onPlayerInteract(PlayerInteractEvent event) {
|
||||||
if (event.getMaterial() != null) {
|
if (event.getMaterial() != null) {
|
||||||
final Action action = event.getAction();
|
final Action action = event.getAction();
|
||||||
final Material type = event.getMaterial();
|
final Material type = event.getMaterial();
|
||||||
final Tool tool = toolsByType.get(type);
|
final Tool tool = toolsByType.get(type);
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
if (tool != null && (action == Action.RIGHT_CLICK_BLOCK || action == Action.LEFT_CLICK_BLOCK) && logblock.hasPermission(player, "logblock.tools." + tool.name)) {
|
if (tool != null && (action == Action.RIGHT_CLICK_BLOCK || action == Action.LEFT_CLICK_BLOCK) && logblock.hasPermission(player, "logblock.tools." + tool.name)) {
|
||||||
final ToolBehavior behavior = action == Action.RIGHT_CLICK_BLOCK ? tool.rightClickBehavior : tool.leftClickBehavior;
|
final ToolBehavior behavior = action == Action.RIGHT_CLICK_BLOCK ? tool.rightClickBehavior : tool.leftClickBehavior;
|
||||||
final ToolData toolData = getSession(player).toolData.get(tool);
|
final ToolData toolData = getSession(player).toolData.get(tool);
|
||||||
if (behavior != ToolBehavior.NONE && toolData.enabled) {
|
if (behavior != ToolBehavior.NONE && toolData.enabled) {
|
||||||
if (!isLogged(player.getWorld())) {
|
if (!isLogged(player.getWorld())) {
|
||||||
player.sendMessage(ChatColor.RED + "This world is not currently logged.");
|
player.sendMessage(ChatColor.RED + "This world is not currently logged.");
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final Block block = event.getClickedBlock();
|
final Block block = event.getClickedBlock();
|
||||||
final QueryParams params = toolData.params.clone();
|
final QueryParams params = toolData.params.clone();
|
||||||
params.loc = null;
|
params.loc = null;
|
||||||
params.sel = null;
|
params.sel = null;
|
||||||
if (behavior == ToolBehavior.BLOCK) {
|
if (behavior == ToolBehavior.BLOCK) {
|
||||||
params.setLocation(block.getRelative(event.getBlockFace()).getLocation());
|
params.setLocation(block.getRelative(event.getBlockFace()).getLocation());
|
||||||
} else if (tool.params.radius != 0) {
|
} else if (tool.params.radius != 0) {
|
||||||
params.setLocation(block.getLocation());
|
params.setLocation(block.getLocation());
|
||||||
} else {
|
} else {
|
||||||
Block otherHalfChest = BukkitUtils.getConnectedChest(block);
|
Block otherHalfChest = BukkitUtils.getConnectedChest(block);
|
||||||
if (otherHalfChest == null) {
|
if (otherHalfChest == null) {
|
||||||
params.setLocation(block.getLocation());
|
params.setLocation(block.getLocation());
|
||||||
} else {
|
} else {
|
||||||
params.setSelection(CuboidRegion.fromCorners(block.getLocation().getWorld(), block.getLocation(), otherHalfChest.getLocation()));
|
params.setSelection(CuboidRegion.fromCorners(block.getLocation().getWorld(), block.getLocation(), otherHalfChest.getLocation()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
params.validate();
|
params.validate();
|
||||||
if (this.callToolUseEvent(new ToolUseEvent(player, tool, behavior, params))) {
|
if (this.callToolUseEvent(new ToolUseEvent(player, tool, behavior, params))) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (toolData.mode == ToolMode.ROLLBACK) {
|
if (toolData.mode == ToolMode.ROLLBACK) {
|
||||||
handler.new CommandRollback(player, params, true);
|
handler.new CommandRollback(player, params, true);
|
||||||
} else if (toolData.mode == ToolMode.REDO) {
|
} else if (toolData.mode == ToolMode.REDO) {
|
||||||
handler.new CommandRedo(player, params, true);
|
handler.new CommandRedo(player, params, true);
|
||||||
} else if (toolData.mode == ToolMode.CLEARLOG) {
|
} else if (toolData.mode == ToolMode.CLEARLOG) {
|
||||||
handler.new CommandClearLog(player, params, true);
|
handler.new CommandClearLog(player, params, true);
|
||||||
} else if (toolData.mode == ToolMode.WRITELOGFILE) {
|
} else if (toolData.mode == ToolMode.WRITELOGFILE) {
|
||||||
handler.new CommandWriteLogFile(player, params, true);
|
handler.new CommandWriteLogFile(player, params, true);
|
||||||
} else {
|
} else {
|
||||||
handler.new CommandLookup(player, params, true);
|
handler.new CommandLookup(player, params, true);
|
||||||
}
|
}
|
||||||
} catch (final Exception ex) {
|
} catch (final Exception ex) {
|
||||||
player.sendMessage(ChatColor.RED + ex.getMessage());
|
player.sendMessage(ChatColor.RED + ex.getMessage());
|
||||||
}
|
}
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean callToolUseEvent(ToolUseEvent event) {
|
private boolean callToolUseEvent(ToolUseEvent event) {
|
||||||
this.logblock.getServer().getPluginManager().callEvent(event);
|
this.logblock.getServer().getPluginManager().callEvent(event);
|
||||||
return event.isCancelled();
|
return event.isCancelled();
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {
|
public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
if (hasSession(player)) {
|
if (hasSession(player)) {
|
||||||
final Session session = getSession(player);
|
final Session session = getSession(player);
|
||||||
for (final Entry<Tool, ToolData> entry : session.toolData.entrySet()) {
|
for (final Entry<Tool, ToolData> entry : session.toolData.entrySet()) {
|
||||||
final Tool tool = entry.getKey();
|
final Tool tool = entry.getKey();
|
||||||
final ToolData toolData = entry.getValue();
|
final ToolData toolData = entry.getValue();
|
||||||
if (toolData.enabled && !logblock.hasPermission(player, "logblock.tools." + tool.name)) {
|
if (toolData.enabled && !logblock.hasPermission(player, "logblock.tools." + tool.name)) {
|
||||||
toolData.enabled = false;
|
toolData.enabled = false;
|
||||||
if (tool.removeOnDisable && logblock.hasPermission(player, "logblock.spawnTools")) {
|
if (tool.removeOnDisable && logblock.hasPermission(player, "logblock.spawnTools")) {
|
||||||
player.getInventory().removeItem(new ItemStack(tool.item, 1));
|
player.getInventory().removeItem(new ItemStack(tool.item, 1));
|
||||||
}
|
}
|
||||||
player.sendMessage(ChatColor.GREEN + "Tool disabled.");
|
player.sendMessage(ChatColor.GREEN + "Tool disabled.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPlayerDropItem(PlayerDropItemEvent event) {
|
public void onPlayerDropItem(PlayerDropItemEvent event) {
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
if (hasSession(player)) {
|
if (hasSession(player)) {
|
||||||
final Session session = getSession(player);
|
final Session session = getSession(player);
|
||||||
for (final Entry<Tool, ToolData> entry : session.toolData.entrySet()) {
|
for (final Entry<Tool, ToolData> entry : session.toolData.entrySet()) {
|
||||||
final Tool tool = entry.getKey();
|
final Tool tool = entry.getKey();
|
||||||
final ToolData toolData = entry.getValue();
|
final ToolData toolData = entry.getValue();
|
||||||
final Material item = event.getItemDrop().getItemStack().getType();
|
final Material item = event.getItemDrop().getItemStack().getType();
|
||||||
if (item == tool.item && toolData.enabled) {
|
if (item == tool.item && toolData.enabled) {
|
||||||
if (tool.dropToDisable) {
|
if (tool.dropToDisable) {
|
||||||
toolData.enabled = false;
|
toolData.enabled = false;
|
||||||
ItemStack stack = event.getItemDrop().getItemStack();
|
ItemStack stack = event.getItemDrop().getItemStack();
|
||||||
if (tool.removeOnDisable && logblock.hasPermission(player, "logblock.spawnTools")) {
|
if (tool.removeOnDisable && logblock.hasPermission(player, "logblock.spawnTools")) {
|
||||||
if (stack.isSimilar(new ItemStack(item))) {
|
if (stack.isSimilar(new ItemStack(item))) {
|
||||||
if (stack.getAmount() > 1) {
|
if (stack.getAmount() > 1) {
|
||||||
stack.setAmount(stack.getAmount() - 1);
|
stack.setAmount(stack.getAmount() - 1);
|
||||||
event.getItemDrop().setItemStack(stack);
|
event.getItemDrop().setItemStack(stack);
|
||||||
} else {
|
} else {
|
||||||
event.getItemDrop().remove();
|
event.getItemDrop().remove();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (BukkitUtils.hasInventoryStorageSpaceFor(player.getInventory(), stack)) {
|
if (BukkitUtils.hasInventoryStorageSpaceFor(player.getInventory(), stack)) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
player.sendMessage(ChatColor.GREEN + "Tool disabled.");
|
player.sendMessage(ChatColor.GREEN + "Tool disabled.");
|
||||||
} else if (!tool.canDrop) {
|
} else if (!tool.canDrop) {
|
||||||
player.sendMessage(ChatColor.RED + "You cannot drop this tool.");
|
player.sendMessage(ChatColor.RED + "You cannot drop this tool.");
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,24 +1,24 @@
|
|||||||
package de.diddiz.LogBlock.listeners;
|
package de.diddiz.LogBlock.listeners;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.Actor;
|
import de.diddiz.LogBlock.Actor;
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
import de.diddiz.LogBlock.Logging;
|
import de.diddiz.LogBlock.Logging;
|
||||||
import org.bukkit.entity.Wither;
|
import org.bukkit.entity.Wither;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.entity.EntityChangeBlockEvent;
|
import org.bukkit.event.entity.EntityChangeBlockEvent;
|
||||||
|
|
||||||
import static de.diddiz.LogBlock.config.Config.isLogging;
|
import static de.diddiz.LogBlock.config.Config.isLogging;
|
||||||
|
|
||||||
public class WitherLogging extends LoggingListener {
|
public class WitherLogging extends LoggingListener {
|
||||||
public WitherLogging(LogBlock lb) {
|
public WitherLogging(LogBlock lb) {
|
||||||
super(lb);
|
super(lb);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||||
public void onEntityChangeBlock(EntityChangeBlockEvent event) {
|
public void onEntityChangeBlock(EntityChangeBlockEvent event) {
|
||||||
if (event.getEntity() instanceof Wither && isLogging(event.getBlock().getWorld(), Logging.WITHER)) {
|
if (event.getEntity() instanceof Wither && isLogging(event.getBlock().getWorld(), Logging.WITHER)) {
|
||||||
consumer.queueBlockReplace(Actor.actorFromEntity(event.getEntity()), event.getBlock().getState(), event.getBlockData()); // Wither walked through a block.
|
consumer.queueBlockReplace(Actor.actorFromEntity(event.getEntity()), event.getBlock().getState(), event.getBlockData()); // Wither walked through a block.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,424 +1,424 @@
|
|||||||
package de.diddiz.LogBlock.util;
|
package de.diddiz.LogBlock.util;
|
||||||
|
|
||||||
// Taken from maven-artifact at
|
// 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
|
// 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
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one
|
* Licensed to the Apache Software Foundation (ASF) under one
|
||||||
* or more contributor license agreements. See the NOTICE file
|
* or more contributor license agreements. See the NOTICE file
|
||||||
* distributed with this work for additional information
|
* distributed with this work for additional information
|
||||||
* regarding copyright ownership. The ASF licenses this file
|
* regarding copyright ownership. The ASF licenses this file
|
||||||
* to you under the Apache License, Version 2.0 (the
|
* to you under the Apache License, Version 2.0 (the
|
||||||
* "License"); you may not use this file except in compliance
|
* "License"); you may not use this file except in compliance
|
||||||
* with the License. You may obtain a copy of the License at
|
* with the License. You may obtain a copy of the License at
|
||||||
*
|
*
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
*
|
*
|
||||||
* Unless required by applicable law or agreed to in writing,
|
* Unless required by applicable law or agreed to in writing,
|
||||||
* software distributed under the License is distributed on an
|
* software distributed under the License is distributed on an
|
||||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
* KIND, either express or implied. See the License for the
|
* KIND, either express or implied. See the License for the
|
||||||
* specific language governing permissions and limitations
|
* specific language governing permissions and limitations
|
||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import java.math.BigInteger;
|
import java.math.BigInteger;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.ListIterator;
|
import java.util.ListIterator;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
import java.util.Stack;
|
import java.util.Stack;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generic implementation of version comparison.
|
* Generic implementation of version comparison.
|
||||||
*
|
*
|
||||||
* <p>Features:
|
* <p>Features:
|
||||||
* <ul>
|
* <ul>
|
||||||
* <li>mixing of '<code>-</code>' (dash) and '<code>.</code>' (dot) separators,</li>
|
* <li>mixing of '<code>-</code>' (dash) and '<code>.</code>' (dot) separators,</li>
|
||||||
* <li>transition between characters and digits also constitutes a separator:
|
* <li>transition between characters and digits also constitutes a separator:
|
||||||
* <code>1.0alpha1 => [1, 0, alpha, 1]</code></li>
|
* <code>1.0alpha1 => [1, 0, alpha, 1]</code></li>
|
||||||
* <li>unlimited number of version components,</li>
|
* <li>unlimited number of version components,</li>
|
||||||
* <li>version components in the text can be digits or strings,</li>
|
* <li>version components in the text can be digits or strings,</li>
|
||||||
* <li>strings are checked for well-known qualifiers and the qualifier ordering is used for version ordering.
|
* <li>strings are checked for well-known qualifiers and the qualifier ordering is used for version ordering.
|
||||||
* Well-known qualifiers (case insensitive) are:<ul>
|
* Well-known qualifiers (case insensitive) are:<ul>
|
||||||
* <li><code>alpha</code> or <code>a</code></li>
|
* <li><code>alpha</code> or <code>a</code></li>
|
||||||
* <li><code>beta</code> or <code>b</code></li>
|
* <li><code>beta</code> or <code>b</code></li>
|
||||||
* <li><code>milestone</code> or <code>m</code></li>
|
* <li><code>milestone</code> or <code>m</code></li>
|
||||||
* <li><code>rc</code> or <code>cr</code></li>
|
* <li><code>rc</code> or <code>cr</code></li>
|
||||||
* <li><code>snapshot</code></li>
|
* <li><code>snapshot</code></li>
|
||||||
* <li><code>(the empty string)</code> or <code>ga</code> or <code>final</code></li>
|
* <li><code>(the empty string)</code> or <code>ga</code> or <code>final</code></li>
|
||||||
* <li><code>sp</code></li>
|
* <li><code>sp</code></li>
|
||||||
* </ul>
|
* </ul>
|
||||||
* Unknown qualifiers are considered after known qualifiers, with lexical order (always case insensitive),
|
* Unknown qualifiers are considered after known qualifiers, with lexical order (always case insensitive),
|
||||||
* </li>
|
* </li>
|
||||||
* <li>a dash usually precedes a qualifier, and is always less important than something preceded with a dot.</li>
|
* <li>a dash usually precedes a qualifier, and is always less important than something preceded with a dot.</li>
|
||||||
* </ul></p>
|
* </ul></p>
|
||||||
*
|
*
|
||||||
* @see <a href="https://cwiki.apache.org/confluence/display/MAVENOLD/Versioning">"Versioning" on Maven Wiki</a>
|
* @see <a href="https://cwiki.apache.org/confluence/display/MAVENOLD/Versioning">"Versioning" on Maven Wiki</a>
|
||||||
* @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
|
* @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
|
||||||
* @author <a href="mailto:hboutemy@apache.org">Hervé Boutemy</a>
|
* @author <a href="mailto:hboutemy@apache.org">Hervé Boutemy</a>
|
||||||
*/
|
*/
|
||||||
public class ComparableVersion implements Comparable<ComparableVersion> {
|
public class ComparableVersion implements Comparable<ComparableVersion> {
|
||||||
private String value;
|
private String value;
|
||||||
|
|
||||||
private String canonical;
|
private String canonical;
|
||||||
|
|
||||||
private ListItem items;
|
private ListItem items;
|
||||||
|
|
||||||
private interface Item {
|
private interface Item {
|
||||||
int INTEGER_ITEM = 0;
|
int INTEGER_ITEM = 0;
|
||||||
int STRING_ITEM = 1;
|
int STRING_ITEM = 1;
|
||||||
int LIST_ITEM = 2;
|
int LIST_ITEM = 2;
|
||||||
|
|
||||||
int compareTo(Item item);
|
int compareTo(Item item);
|
||||||
|
|
||||||
int getType();
|
int getType();
|
||||||
|
|
||||||
boolean isNull();
|
boolean isNull();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents a numeric item in the version item list.
|
* Represents a numeric item in the version item list.
|
||||||
*/
|
*/
|
||||||
private static class IntegerItem implements Item {
|
private static class IntegerItem implements Item {
|
||||||
private static final BigInteger BIG_INTEGER_ZERO = new BigInteger("0");
|
private static final BigInteger BIG_INTEGER_ZERO = new BigInteger("0");
|
||||||
|
|
||||||
private final BigInteger value;
|
private final BigInteger value;
|
||||||
|
|
||||||
public static final IntegerItem ZERO = new IntegerItem();
|
public static final IntegerItem ZERO = new IntegerItem();
|
||||||
|
|
||||||
private IntegerItem() {
|
private IntegerItem() {
|
||||||
this.value = BIG_INTEGER_ZERO;
|
this.value = BIG_INTEGER_ZERO;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IntegerItem(String str) {
|
public IntegerItem(String str) {
|
||||||
this.value = new BigInteger(str);
|
this.value = new BigInteger(str);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getType() {
|
public int getType() {
|
||||||
return INTEGER_ITEM;
|
return INTEGER_ITEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isNull() {
|
public boolean isNull() {
|
||||||
return BIG_INTEGER_ZERO.equals(value);
|
return BIG_INTEGER_ZERO.equals(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int compareTo(Item item) {
|
public int compareTo(Item item) {
|
||||||
if (item == null) {
|
if (item == null) {
|
||||||
return BIG_INTEGER_ZERO.equals(value) ? 0 : 1; // 1.0 == 1, 1.1 > 1
|
return BIG_INTEGER_ZERO.equals(value) ? 0 : 1; // 1.0 == 1, 1.1 > 1
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (item.getType()) {
|
switch (item.getType()) {
|
||||||
case INTEGER_ITEM:
|
case INTEGER_ITEM:
|
||||||
return value.compareTo(((IntegerItem) item).value);
|
return value.compareTo(((IntegerItem) item).value);
|
||||||
|
|
||||||
case STRING_ITEM:
|
case STRING_ITEM:
|
||||||
return 1; // 1.1 > 1-sp
|
return 1; // 1.1 > 1-sp
|
||||||
|
|
||||||
case LIST_ITEM:
|
case LIST_ITEM:
|
||||||
return 1; // 1.1 > 1-1
|
return 1; // 1.1 > 1-1
|
||||||
|
|
||||||
default:
|
default:
|
||||||
throw new RuntimeException("invalid item: " + item.getClass());
|
throw new RuntimeException("invalid item: " + item.getClass());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return value.toString();
|
return value.toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents a string in the version item list, usually a qualifier.
|
* Represents a string in the version item list, usually a qualifier.
|
||||||
*/
|
*/
|
||||||
private static class StringItem implements Item {
|
private static class StringItem implements Item {
|
||||||
private static final String[] QUALIFIERS = { "alpha", "beta", "milestone", "rc", "snapshot", "", "sp" };
|
private static final String[] QUALIFIERS = { "alpha", "beta", "milestone", "rc", "snapshot", "", "sp" };
|
||||||
|
|
||||||
private static final List<String> _QUALIFIERS = Arrays.asList(QUALIFIERS);
|
private static final List<String> _QUALIFIERS = Arrays.asList(QUALIFIERS);
|
||||||
|
|
||||||
private static final Properties ALIASES = new Properties();
|
private static final Properties ALIASES = new Properties();
|
||||||
static {
|
static {
|
||||||
ALIASES.put("ga", "");
|
ALIASES.put("ga", "");
|
||||||
ALIASES.put("final", "");
|
ALIASES.put("final", "");
|
||||||
ALIASES.put("cr", "rc");
|
ALIASES.put("cr", "rc");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A comparable value for the empty-string qualifier. This one is used to determine if a given qualifier makes
|
* A comparable value for the empty-string qualifier. This one is used to determine if a given qualifier makes
|
||||||
* the version older than one without a qualifier, or more recent.
|
* the version older than one without a qualifier, or more recent.
|
||||||
*/
|
*/
|
||||||
private static final String RELEASE_VERSION_INDEX = String.valueOf(_QUALIFIERS.indexOf(""));
|
private static final String RELEASE_VERSION_INDEX = String.valueOf(_QUALIFIERS.indexOf(""));
|
||||||
|
|
||||||
private String value;
|
private String value;
|
||||||
|
|
||||||
public StringItem(String value, boolean followedByDigit) {
|
public StringItem(String value, boolean followedByDigit) {
|
||||||
if (followedByDigit && value.length() == 1) {
|
if (followedByDigit && value.length() == 1) {
|
||||||
// a1 = alpha-1, b1 = beta-1, m1 = milestone-1
|
// a1 = alpha-1, b1 = beta-1, m1 = milestone-1
|
||||||
switch (value.charAt(0)) {
|
switch (value.charAt(0)) {
|
||||||
case 'a':
|
case 'a':
|
||||||
value = "alpha";
|
value = "alpha";
|
||||||
break;
|
break;
|
||||||
case 'b':
|
case 'b':
|
||||||
value = "beta";
|
value = "beta";
|
||||||
break;
|
break;
|
||||||
case 'm':
|
case 'm':
|
||||||
value = "milestone";
|
value = "milestone";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.value = ALIASES.getProperty(value, value);
|
this.value = ALIASES.getProperty(value, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getType() {
|
public int getType() {
|
||||||
return STRING_ITEM;
|
return STRING_ITEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isNull() {
|
public boolean isNull() {
|
||||||
return (comparableQualifier(value).compareTo(RELEASE_VERSION_INDEX) == 0);
|
return (comparableQualifier(value).compareTo(RELEASE_VERSION_INDEX) == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns a comparable value for a qualifier.
|
* Returns a comparable value for a qualifier.
|
||||||
*
|
*
|
||||||
* This method takes into account the ordering of known qualifiers then unknown qualifiers with lexical ordering.
|
* This method takes into account the ordering of known qualifiers then unknown qualifiers with lexical ordering.
|
||||||
*
|
*
|
||||||
* just returning an Integer with the index here is faster, but requires a lot of if/then/else to check for -1
|
* just returning an Integer with the index here is faster, but requires a lot of if/then/else to check for -1
|
||||||
* or QUALIFIERS.size and then resort to lexical ordering. Most comparisons are decided by the first character,
|
* or QUALIFIERS.size and then resort to lexical ordering. Most comparisons are decided by the first character,
|
||||||
* so this is still fast. If more characters are needed then it requires a lexical sort anyway.
|
* so this is still fast. If more characters are needed then it requires a lexical sort anyway.
|
||||||
*
|
*
|
||||||
* @param qualifier
|
* @param qualifier
|
||||||
* @return an equivalent value that can be used with lexical comparison
|
* @return an equivalent value that can be used with lexical comparison
|
||||||
*/
|
*/
|
||||||
public static String comparableQualifier(String qualifier) {
|
public static String comparableQualifier(String qualifier) {
|
||||||
int i = _QUALIFIERS.indexOf(qualifier);
|
int i = _QUALIFIERS.indexOf(qualifier);
|
||||||
|
|
||||||
return i == -1 ? (_QUALIFIERS.size() + "-" + qualifier) : String.valueOf(i);
|
return i == -1 ? (_QUALIFIERS.size() + "-" + qualifier) : String.valueOf(i);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int compareTo(Item item) {
|
public int compareTo(Item item) {
|
||||||
if (item == null) {
|
if (item == null) {
|
||||||
// 1-rc < 1, 1-ga > 1
|
// 1-rc < 1, 1-ga > 1
|
||||||
return comparableQualifier(value).compareTo(RELEASE_VERSION_INDEX);
|
return comparableQualifier(value).compareTo(RELEASE_VERSION_INDEX);
|
||||||
}
|
}
|
||||||
switch (item.getType()) {
|
switch (item.getType()) {
|
||||||
case INTEGER_ITEM:
|
case INTEGER_ITEM:
|
||||||
return -1; // 1.any < 1.1 ?
|
return -1; // 1.any < 1.1 ?
|
||||||
|
|
||||||
case STRING_ITEM:
|
case STRING_ITEM:
|
||||||
return comparableQualifier(value).compareTo(comparableQualifier(((StringItem) item).value));
|
return comparableQualifier(value).compareTo(comparableQualifier(((StringItem) item).value));
|
||||||
|
|
||||||
case LIST_ITEM:
|
case LIST_ITEM:
|
||||||
return -1; // 1.any < 1-1
|
return -1; // 1.any < 1-1
|
||||||
|
|
||||||
default:
|
default:
|
||||||
throw new RuntimeException("invalid item: " + item.getClass());
|
throw new RuntimeException("invalid item: " + item.getClass());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents a version list item. This class is used both for the global item list and for sub-lists (which start
|
* Represents a version list item. This class is used both for the global item list and for sub-lists (which start
|
||||||
* with '-(number)' in the version specification).
|
* with '-(number)' in the version specification).
|
||||||
*/
|
*/
|
||||||
private static class ListItem extends ArrayList<Item> implements Item {
|
private static class ListItem extends ArrayList<Item> implements Item {
|
||||||
private static final long serialVersionUID = 5914575811857700009L;
|
private static final long serialVersionUID = 5914575811857700009L;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getType() {
|
public int getType() {
|
||||||
return LIST_ITEM;
|
return LIST_ITEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isNull() {
|
public boolean isNull() {
|
||||||
return (size() == 0);
|
return (size() == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void normalize() {
|
void normalize() {
|
||||||
for (ListIterator<Item> iterator = listIterator(size()); iterator.hasPrevious();) {
|
for (ListIterator<Item> iterator = listIterator(size()); iterator.hasPrevious();) {
|
||||||
Item item = iterator.previous();
|
Item item = iterator.previous();
|
||||||
if (item.isNull()) {
|
if (item.isNull()) {
|
||||||
iterator.remove(); // remove null trailing items: 0, "", empty list
|
iterator.remove(); // remove null trailing items: 0, "", empty list
|
||||||
} else {
|
} else {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int compareTo(Item item) {
|
public int compareTo(Item item) {
|
||||||
if (item == null) {
|
if (item == null) {
|
||||||
if (size() == 0) {
|
if (size() == 0) {
|
||||||
return 0; // 1-0 = 1- (normalize) = 1
|
return 0; // 1-0 = 1- (normalize) = 1
|
||||||
}
|
}
|
||||||
Item first = get(0);
|
Item first = get(0);
|
||||||
return first.compareTo(null);
|
return first.compareTo(null);
|
||||||
}
|
}
|
||||||
switch (item.getType()) {
|
switch (item.getType()) {
|
||||||
case INTEGER_ITEM:
|
case INTEGER_ITEM:
|
||||||
return -1; // 1-1 < 1.0.x
|
return -1; // 1-1 < 1.0.x
|
||||||
|
|
||||||
case STRING_ITEM:
|
case STRING_ITEM:
|
||||||
return 1; // 1-1 > 1-sp
|
return 1; // 1-1 > 1-sp
|
||||||
|
|
||||||
case LIST_ITEM:
|
case LIST_ITEM:
|
||||||
Iterator<Item> left = iterator();
|
Iterator<Item> left = iterator();
|
||||||
Iterator<Item> right = ((ListItem) item).iterator();
|
Iterator<Item> right = ((ListItem) item).iterator();
|
||||||
|
|
||||||
while (left.hasNext() || right.hasNext()) {
|
while (left.hasNext() || right.hasNext()) {
|
||||||
Item l = left.hasNext() ? left.next() : null;
|
Item l = left.hasNext() ? left.next() : null;
|
||||||
Item r = right.hasNext() ? right.next() : null;
|
Item r = right.hasNext() ? right.next() : null;
|
||||||
|
|
||||||
// if this is shorter, then invert the compare and mul with -1
|
// if this is shorter, then invert the compare and mul with -1
|
||||||
int result = l == null ? (r == null ? 0 : -1 * r.compareTo(l)) : l.compareTo(r);
|
int result = l == null ? (r == null ? 0 : -1 * r.compareTo(l)) : l.compareTo(r);
|
||||||
|
|
||||||
if (result != 0) {
|
if (result != 0) {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
throw new RuntimeException("invalid item: " + item.getClass());
|
throw new RuntimeException("invalid item: " + item.getClass());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
StringBuilder buffer = new StringBuilder("(");
|
StringBuilder buffer = new StringBuilder("(");
|
||||||
for (Iterator<Item> iter = iterator(); iter.hasNext();) {
|
for (Iterator<Item> iter = iterator(); iter.hasNext();) {
|
||||||
buffer.append(iter.next());
|
buffer.append(iter.next());
|
||||||
if (iter.hasNext()) {
|
if (iter.hasNext()) {
|
||||||
buffer.append(',');
|
buffer.append(',');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
buffer.append(')');
|
buffer.append(')');
|
||||||
return buffer.toString();
|
return buffer.toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public ComparableVersion(String version) {
|
public ComparableVersion(String version) {
|
||||||
parseVersion(version);
|
parseVersion(version);
|
||||||
}
|
}
|
||||||
|
|
||||||
public final void parseVersion(String version) {
|
public final void parseVersion(String version) {
|
||||||
this.value = version;
|
this.value = version;
|
||||||
|
|
||||||
items = new ListItem();
|
items = new ListItem();
|
||||||
|
|
||||||
version = version.toLowerCase(Locale.ENGLISH);
|
version = version.toLowerCase(Locale.ENGLISH);
|
||||||
|
|
||||||
ListItem list = items;
|
ListItem list = items;
|
||||||
|
|
||||||
Stack<Item> stack = new Stack<>();
|
Stack<Item> stack = new Stack<>();
|
||||||
stack.push(list);
|
stack.push(list);
|
||||||
|
|
||||||
boolean isDigit = false;
|
boolean isDigit = false;
|
||||||
|
|
||||||
int startIndex = 0;
|
int startIndex = 0;
|
||||||
|
|
||||||
for (int i = 0; i < version.length(); i++) {
|
for (int i = 0; i < version.length(); i++) {
|
||||||
char c = version.charAt(i);
|
char c = version.charAt(i);
|
||||||
|
|
||||||
if (c == '.') {
|
if (c == '.') {
|
||||||
if (i == startIndex) {
|
if (i == startIndex) {
|
||||||
list.add(IntegerItem.ZERO);
|
list.add(IntegerItem.ZERO);
|
||||||
} else {
|
} else {
|
||||||
list.add(parseItem(isDigit, version.substring(startIndex, i)));
|
list.add(parseItem(isDigit, version.substring(startIndex, i)));
|
||||||
}
|
}
|
||||||
startIndex = i + 1;
|
startIndex = i + 1;
|
||||||
} else if (c == '-') {
|
} else if (c == '-') {
|
||||||
if (i == startIndex) {
|
if (i == startIndex) {
|
||||||
list.add(IntegerItem.ZERO);
|
list.add(IntegerItem.ZERO);
|
||||||
} else {
|
} else {
|
||||||
list.add(parseItem(isDigit, version.substring(startIndex, i)));
|
list.add(parseItem(isDigit, version.substring(startIndex, i)));
|
||||||
}
|
}
|
||||||
startIndex = i + 1;
|
startIndex = i + 1;
|
||||||
|
|
||||||
if (isDigit) {
|
if (isDigit) {
|
||||||
list.normalize(); // 1.0-* = 1-*
|
list.normalize(); // 1.0-* = 1-*
|
||||||
|
|
||||||
if ((i + 1 < version.length()) && Character.isDigit(version.charAt(i + 1))) {
|
if ((i + 1 < version.length()) && Character.isDigit(version.charAt(i + 1))) {
|
||||||
// new ListItem only if previous were digits and new char is a digit,
|
// new ListItem only if previous were digits and new char is a digit,
|
||||||
// ie need to differentiate only 1.1 from 1-1
|
// ie need to differentiate only 1.1 from 1-1
|
||||||
list.add(list = new ListItem());
|
list.add(list = new ListItem());
|
||||||
|
|
||||||
stack.push(list);
|
stack.push(list);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (Character.isDigit(c)) {
|
} else if (Character.isDigit(c)) {
|
||||||
if (!isDigit && i > startIndex) {
|
if (!isDigit && i > startIndex) {
|
||||||
list.add(new StringItem(version.substring(startIndex, i), true));
|
list.add(new StringItem(version.substring(startIndex, i), true));
|
||||||
startIndex = i;
|
startIndex = i;
|
||||||
}
|
}
|
||||||
|
|
||||||
isDigit = true;
|
isDigit = true;
|
||||||
} else {
|
} else {
|
||||||
if (isDigit && i > startIndex) {
|
if (isDigit && i > startIndex) {
|
||||||
list.add(parseItem(true, version.substring(startIndex, i)));
|
list.add(parseItem(true, version.substring(startIndex, i)));
|
||||||
startIndex = i;
|
startIndex = i;
|
||||||
}
|
}
|
||||||
|
|
||||||
isDigit = false;
|
isDigit = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (version.length() > startIndex) {
|
if (version.length() > startIndex) {
|
||||||
list.add(parseItem(isDigit, version.substring(startIndex)));
|
list.add(parseItem(isDigit, version.substring(startIndex)));
|
||||||
}
|
}
|
||||||
|
|
||||||
while (!stack.isEmpty()) {
|
while (!stack.isEmpty()) {
|
||||||
list = (ListItem) stack.pop();
|
list = (ListItem) stack.pop();
|
||||||
list.normalize();
|
list.normalize();
|
||||||
}
|
}
|
||||||
|
|
||||||
canonical = items.toString();
|
canonical = items.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Item parseItem(boolean isDigit, String buf) {
|
private static Item parseItem(boolean isDigit, String buf) {
|
||||||
return isDigit ? new IntegerItem(buf) : new StringItem(buf, false);
|
return isDigit ? new IntegerItem(buf) : new StringItem(buf, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int compareTo(ComparableVersion o) {
|
public int compareTo(ComparableVersion o) {
|
||||||
return items.compareTo(o.items);
|
return items.compareTo(o.items);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int compareTo(String version) {
|
public int compareTo(String version) {
|
||||||
return compareTo(new ComparableVersion(version));
|
return compareTo(new ComparableVersion(version));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String toCanonicalString() {
|
public String toCanonicalString() {
|
||||||
return canonical;
|
return canonical;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean equals(Object o) {
|
public boolean equals(Object o) {
|
||||||
return (o instanceof ComparableVersion) && canonical.equals(((ComparableVersion) o).canonical);
|
return (o instanceof ComparableVersion) && canonical.equals(((ComparableVersion) o).canonical);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int hashCode() {
|
public int hashCode() {
|
||||||
return canonical.hashCode();
|
return canonical.hashCode();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,51 +1,51 @@
|
|||||||
package de.diddiz.LogBlock.util;
|
package de.diddiz.LogBlock.util;
|
||||||
|
|
||||||
import com.zaxxer.hikari.HikariDataSource;
|
import com.zaxxer.hikari.HikariDataSource;
|
||||||
import de.diddiz.LogBlock.config.Config;
|
import de.diddiz.LogBlock.config.Config;
|
||||||
|
|
||||||
import java.io.Closeable;
|
import java.io.Closeable;
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
|
|
||||||
public class MySQLConnectionPool implements Closeable {
|
public class MySQLConnectionPool implements Closeable {
|
||||||
|
|
||||||
private final HikariDataSource ds;
|
private final HikariDataSource ds;
|
||||||
|
|
||||||
public MySQLConnectionPool(String url, String user, String password, boolean useSSL, boolean requireSSL) {
|
public MySQLConnectionPool(String url, String user, String password, boolean useSSL, boolean requireSSL) {
|
||||||
this.ds = new HikariDataSource();
|
this.ds = new HikariDataSource();
|
||||||
ds.setJdbcUrl(url);
|
ds.setJdbcUrl(url);
|
||||||
ds.setUsername(user);
|
ds.setUsername(user);
|
||||||
ds.setPassword(password);
|
ds.setPassword(password);
|
||||||
|
|
||||||
ds.setMinimumIdle(2);
|
ds.setMinimumIdle(2);
|
||||||
ds.setMaximumPoolSize(15);
|
ds.setMaximumPoolSize(15);
|
||||||
ds.setPoolName("LogBlock-Connection-Pool");
|
ds.setPoolName("LogBlock-Connection-Pool");
|
||||||
|
|
||||||
ds.addDataSourceProperty("useUnicode", "true");
|
ds.addDataSourceProperty("useUnicode", "true");
|
||||||
ds.addDataSourceProperty("characterEncoding", "utf-8");
|
ds.addDataSourceProperty("characterEncoding", "utf-8");
|
||||||
ds.addDataSourceProperty("rewriteBatchedStatements", "true");
|
ds.addDataSourceProperty("rewriteBatchedStatements", "true");
|
||||||
|
|
||||||
ds.addDataSourceProperty("cachePrepStmts", "true");
|
ds.addDataSourceProperty("cachePrepStmts", "true");
|
||||||
ds.addDataSourceProperty("prepStmtCacheSize", "250");
|
ds.addDataSourceProperty("prepStmtCacheSize", "250");
|
||||||
ds.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
|
ds.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
|
||||||
ds.addDataSourceProperty("useServerPrepStmts", "true");
|
ds.addDataSourceProperty("useServerPrepStmts", "true");
|
||||||
|
|
||||||
ds.addDataSourceProperty("useSSL", Boolean.toString(useSSL));
|
ds.addDataSourceProperty("useSSL", Boolean.toString(useSSL));
|
||||||
ds.addDataSourceProperty("requireSSL", Boolean.toString(requireSSL));
|
ds.addDataSourceProperty("requireSSL", Boolean.toString(requireSSL));
|
||||||
ds.addDataSourceProperty("verifyServerCertificate", "false");
|
ds.addDataSourceProperty("verifyServerCertificate", "false");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void close() {
|
public void close() {
|
||||||
ds.close();
|
ds.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
public Connection getConnection() throws SQLException {
|
public Connection getConnection() throws SQLException {
|
||||||
Connection connection = ds.getConnection();
|
Connection connection = ds.getConnection();
|
||||||
if (Config.mb4) {
|
if (Config.mb4) {
|
||||||
connection.createStatement().executeUpdate("SET NAMES utf8mb4");
|
connection.createStatement().executeUpdate("SET NAMES utf8mb4");
|
||||||
}
|
}
|
||||||
return connection;
|
return connection;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,61 +1,61 @@
|
|||||||
package de.diddiz.LogBlock.util;
|
package de.diddiz.LogBlock.util;
|
||||||
|
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.google.gson.GsonBuilder;
|
import com.google.gson.GsonBuilder;
|
||||||
import com.google.gson.JsonArray;
|
import com.google.gson.JsonArray;
|
||||||
import com.google.gson.JsonElement;
|
import com.google.gson.JsonElement;
|
||||||
import com.google.gson.JsonObject;
|
import com.google.gson.JsonObject;
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
import java.net.HttpURLConnection;
|
import java.net.HttpURLConnection;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
// Adapted from https://gist.github.com/evilmidget38/26d70114b834f71fb3b4
|
// Adapted from https://gist.github.com/evilmidget38/26d70114b834f71fb3b4
|
||||||
|
|
||||||
public class UUIDFetcher {
|
public class UUIDFetcher {
|
||||||
|
|
||||||
private static final String PROFILE_URL = "https://api.mojang.com/profiles/minecraft";
|
private static final String PROFILE_URL = "https://api.mojang.com/profiles/minecraft";
|
||||||
private static final Gson gson = new GsonBuilder().setLenient().create();
|
private static final Gson gson = new GsonBuilder().setLenient().create();
|
||||||
|
|
||||||
public static Map<String, UUID> getUUIDs(List<String> names) throws Exception {
|
public static Map<String, UUID> getUUIDs(List<String> names) throws Exception {
|
||||||
Map<String, UUID> uuidMap = new HashMap<>();
|
Map<String, UUID> uuidMap = new HashMap<>();
|
||||||
HttpURLConnection connection = createConnection();
|
HttpURLConnection connection = createConnection();
|
||||||
String body = gson.toJson(names);
|
String body = gson.toJson(names);
|
||||||
writeBody(connection, body);
|
writeBody(connection, body);
|
||||||
JsonArray array = gson.fromJson(new InputStreamReader(connection.getInputStream()), JsonArray.class);
|
JsonArray array = gson.fromJson(new InputStreamReader(connection.getInputStream()), JsonArray.class);
|
||||||
for (JsonElement profile : array) {
|
for (JsonElement profile : array) {
|
||||||
JsonObject jsonProfile = (JsonObject) profile;
|
JsonObject jsonProfile = (JsonObject) profile;
|
||||||
String id = jsonProfile.get("id").getAsString();
|
String id = jsonProfile.get("id").getAsString();
|
||||||
String name = jsonProfile.get("name").getAsString();
|
String name = jsonProfile.get("name").getAsString();
|
||||||
UUID uuid = getUUID(id);
|
UUID uuid = getUUID(id);
|
||||||
uuidMap.put(name, uuid);
|
uuidMap.put(name, uuid);
|
||||||
}
|
}
|
||||||
return uuidMap;
|
return uuidMap;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void writeBody(HttpURLConnection connection, String body) throws Exception {
|
private static void writeBody(HttpURLConnection connection, String body) throws Exception {
|
||||||
OutputStream stream = connection.getOutputStream();
|
OutputStream stream = connection.getOutputStream();
|
||||||
stream.write(body.getBytes());
|
stream.write(body.getBytes());
|
||||||
stream.flush();
|
stream.flush();
|
||||||
stream.close();
|
stream.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static HttpURLConnection createConnection() throws Exception {
|
private static HttpURLConnection createConnection() throws Exception {
|
||||||
URL url = new URL(PROFILE_URL);
|
URL url = new URL(PROFILE_URL);
|
||||||
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
|
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
|
||||||
connection.setRequestMethod("POST");
|
connection.setRequestMethod("POST");
|
||||||
connection.setRequestProperty("Content-Type", "application/json");
|
connection.setRequestProperty("Content-Type", "application/json");
|
||||||
connection.setUseCaches(false);
|
connection.setUseCaches(false);
|
||||||
connection.setDoInput(true);
|
connection.setDoInput(true);
|
||||||
connection.setDoOutput(true);
|
connection.setDoOutput(true);
|
||||||
return connection;
|
return connection;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static UUID getUUID(String id) {
|
private static UUID getUUID(String id) {
|
||||||
return UUID.fromString(id.substring(0, 8) + "-" + id.substring(8, 12) + "-" + id.substring(12, 16) + "-" + id.substring(16, 20) + "-" + id.substring(20, 32));
|
return UUID.fromString(id.substring(0, 8) + "-" + id.substring(8, 12) + "-" + id.substring(12, 16) + "-" + id.substring(16, 20) + "-" + id.substring(20, 32));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,298 +1,298 @@
|
|||||||
package de.diddiz.LogBlock.util;
|
package de.diddiz.LogBlock.util;
|
||||||
|
|
||||||
import java.io.ByteArrayInputStream;
|
import java.io.ByteArrayInputStream;
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FilenameFilter;
|
import java.io.FilenameFilter;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
import java.io.OutputStreamWriter;
|
import java.io.OutputStreamWriter;
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
import java.util.zip.GZIPInputStream;
|
import java.util.zip.GZIPInputStream;
|
||||||
import java.util.zip.GZIPOutputStream;
|
import java.util.zip.GZIPOutputStream;
|
||||||
import java.util.zip.ZipException;
|
import java.util.zip.ZipException;
|
||||||
|
|
||||||
import org.bukkit.configuration.InvalidConfigurationException;
|
import org.bukkit.configuration.InvalidConfigurationException;
|
||||||
import org.bukkit.configuration.file.YamlConfiguration;
|
import org.bukkit.configuration.file.YamlConfiguration;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
import de.diddiz.LogBlock.LogBlock;
|
import de.diddiz.LogBlock.LogBlock;
|
||||||
|
|
||||||
public class Utils {
|
public class Utils {
|
||||||
public static String newline = System.getProperty("line.separator");
|
public static String newline = System.getProperty("line.separator");
|
||||||
|
|
||||||
public static boolean isInt(String str) {
|
public static boolean isInt(String str) {
|
||||||
try {
|
try {
|
||||||
Integer.parseInt(str);
|
Integer.parseInt(str);
|
||||||
return true;
|
return true;
|
||||||
} catch (final NumberFormatException ex) {
|
} catch (final NumberFormatException ex) {
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isShort(String str) {
|
public static boolean isShort(String str) {
|
||||||
try {
|
try {
|
||||||
Short.parseShort(str);
|
Short.parseShort(str);
|
||||||
return true;
|
return true;
|
||||||
} catch (final NumberFormatException ex) {
|
} catch (final NumberFormatException ex) {
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isByte(String str) {
|
public static boolean isByte(String str) {
|
||||||
try {
|
try {
|
||||||
Byte.parseByte(str);
|
Byte.parseByte(str);
|
||||||
return true;
|
return true;
|
||||||
} catch (final NumberFormatException ex) {
|
} catch (final NumberFormatException ex) {
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String listing(String[] entries, String delimiter, String finalDelimiter) {
|
public static String listing(String[] entries, String delimiter, String finalDelimiter) {
|
||||||
final int len = entries.length;
|
final int len = entries.length;
|
||||||
if (len == 0) {
|
if (len == 0) {
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
if (len == 1) {
|
if (len == 1) {
|
||||||
return entries[0];
|
return entries[0];
|
||||||
}
|
}
|
||||||
final StringBuilder builder = new StringBuilder(entries[0]);
|
final StringBuilder builder = new StringBuilder(entries[0]);
|
||||||
for (int i = 1; i < len - 1; i++) {
|
for (int i = 1; i < len - 1; i++) {
|
||||||
builder.append(delimiter).append(entries[i]);
|
builder.append(delimiter).append(entries[i]);
|
||||||
}
|
}
|
||||||
builder.append(finalDelimiter).append(entries[len - 1]);
|
builder.append(finalDelimiter).append(entries[len - 1]);
|
||||||
return builder.toString();
|
return builder.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String listing(List<?> entries, String delimiter, String finalDelimiter) {
|
public static String listing(List<?> entries, String delimiter, String finalDelimiter) {
|
||||||
final int len = entries.size();
|
final int len = entries.size();
|
||||||
if (len == 0) {
|
if (len == 0) {
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
if (len == 1) {
|
if (len == 1) {
|
||||||
return entries.get(0).toString();
|
return entries.get(0).toString();
|
||||||
}
|
}
|
||||||
final StringBuilder builder = new StringBuilder(entries.get(0).toString());
|
final StringBuilder builder = new StringBuilder(entries.get(0).toString());
|
||||||
for (int i = 1; i < len - 1; i++) {
|
for (int i = 1; i < len - 1; i++) {
|
||||||
builder.append(delimiter).append(entries.get(i).toString());
|
builder.append(delimiter).append(entries.get(i).toString());
|
||||||
}
|
}
|
||||||
builder.append(finalDelimiter).append(entries.get(len - 1).toString());
|
builder.append(finalDelimiter).append(entries.get(len - 1).toString());
|
||||||
return builder.toString();
|
return builder.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int parseTimeSpec(String[] spec) {
|
public static int parseTimeSpec(String[] spec) {
|
||||||
if (spec == null || spec.length < 1 || spec.length > 2) {
|
if (spec == null || spec.length < 1 || spec.length > 2) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (spec.length == 1 && isInt(spec[0])) {
|
if (spec.length == 1 && isInt(spec[0])) {
|
||||||
return Integer.valueOf(spec[0]);
|
return Integer.valueOf(spec[0]);
|
||||||
}
|
}
|
||||||
if (!spec[0].contains(":") && !spec[0].contains(".")) {
|
if (!spec[0].contains(":") && !spec[0].contains(".")) {
|
||||||
if (spec.length == 2) {
|
if (spec.length == 2) {
|
||||||
if (!isInt(spec[0])) {
|
if (!isInt(spec[0])) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
int min = Integer.parseInt(spec[0]);
|
int min = Integer.parseInt(spec[0]);
|
||||||
if (spec[1].startsWith("h")) {
|
if (spec[1].startsWith("h")) {
|
||||||
min *= 60;
|
min *= 60;
|
||||||
} else if (spec[1].startsWith("d")) {
|
} else if (spec[1].startsWith("d")) {
|
||||||
min *= 1440;
|
min *= 1440;
|
||||||
}
|
}
|
||||||
return min;
|
return min;
|
||||||
} else if (spec.length == 1) {
|
} else if (spec.length == 1) {
|
||||||
int days = 0, hours = 0, minutes = 0;
|
int days = 0, hours = 0, minutes = 0;
|
||||||
int lastIndex = 0, currIndex = 1;
|
int lastIndex = 0, currIndex = 1;
|
||||||
while (currIndex <= spec[0].length()) {
|
while (currIndex <= spec[0].length()) {
|
||||||
while (currIndex <= spec[0].length() && isInt(spec[0].substring(lastIndex, currIndex))) {
|
while (currIndex <= spec[0].length() && isInt(spec[0].substring(lastIndex, currIndex))) {
|
||||||
currIndex++;
|
currIndex++;
|
||||||
}
|
}
|
||||||
if (currIndex - 1 != lastIndex) {
|
if (currIndex - 1 != lastIndex) {
|
||||||
if (currIndex > spec[0].length()) {
|
if (currIndex > spec[0].length()) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
final String param = spec[0].substring(currIndex - 1, currIndex).toLowerCase();
|
final String param = spec[0].substring(currIndex - 1, currIndex).toLowerCase();
|
||||||
if (param.equals("d")) {
|
if (param.equals("d")) {
|
||||||
days = Integer.parseInt(spec[0].substring(lastIndex, currIndex - 1));
|
days = Integer.parseInt(spec[0].substring(lastIndex, currIndex - 1));
|
||||||
} else if (param.equals("h")) {
|
} else if (param.equals("h")) {
|
||||||
hours = Integer.parseInt(spec[0].substring(lastIndex, currIndex - 1));
|
hours = Integer.parseInt(spec[0].substring(lastIndex, currIndex - 1));
|
||||||
} else if (param.equals("m")) {
|
} else if (param.equals("m")) {
|
||||||
minutes = Integer.parseInt(spec[0].substring(lastIndex, currIndex - 1));
|
minutes = Integer.parseInt(spec[0].substring(lastIndex, currIndex - 1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
lastIndex = currIndex;
|
lastIndex = currIndex;
|
||||||
currIndex++;
|
currIndex++;
|
||||||
}
|
}
|
||||||
if (days == 0 && hours == 0 && minutes == 0) {
|
if (days == 0 && hours == 0 && minutes == 0) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
return minutes + hours * 60 + days * 1440;
|
return minutes + hours * 60 + days * 1440;
|
||||||
} else {
|
} else {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
final String timestamp;
|
final String timestamp;
|
||||||
if (spec.length == 1) {
|
if (spec.length == 1) {
|
||||||
if (spec[0].contains(":")) {
|
if (spec[0].contains(":")) {
|
||||||
timestamp = new SimpleDateFormat("dd.MM.yyyy").format(System.currentTimeMillis()) + " " + spec[0];
|
timestamp = new SimpleDateFormat("dd.MM.yyyy").format(System.currentTimeMillis()) + " " + spec[0];
|
||||||
} else {
|
} else {
|
||||||
timestamp = spec[0] + " 00:00:00";
|
timestamp = spec[0] + " 00:00:00";
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
timestamp = spec[0] + " " + spec[1];
|
timestamp = spec[0] + " " + spec[1];
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
return (int) ((System.currentTimeMillis() - new SimpleDateFormat("dd.MM.yyyy HH:mm:ss").parse(timestamp).getTime()) / 60000);
|
return (int) ((System.currentTimeMillis() - new SimpleDateFormat("dd.MM.yyyy HH:mm:ss").parse(timestamp).getTime()) / 60000);
|
||||||
} catch (final ParseException ex) {
|
} catch (final ParseException ex) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String spaces(int count) {
|
public static String spaces(int count) {
|
||||||
final StringBuilder filled = new StringBuilder(count);
|
final StringBuilder filled = new StringBuilder(count);
|
||||||
for (int i = 0; i < count; i++) {
|
for (int i = 0; i < count; i++) {
|
||||||
filled.append(' ');
|
filled.append(' ');
|
||||||
}
|
}
|
||||||
return filled.toString();
|
return filled.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String join(String[] s, String delimiter) {
|
public static String join(String[] s, String delimiter) {
|
||||||
if (s == null || s.length == 0) {
|
if (s == null || s.length == 0) {
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
final int len = s.length;
|
final int len = s.length;
|
||||||
final StringBuilder builder = new StringBuilder(s[0]);
|
final StringBuilder builder = new StringBuilder(s[0]);
|
||||||
for (int i = 1; i < len; i++) {
|
for (int i = 1; i < len; i++) {
|
||||||
builder.append(delimiter).append(s[i]);
|
builder.append(delimiter).append(s[i]);
|
||||||
}
|
}
|
||||||
return builder.toString();
|
return builder.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Converts a list of arguments e.g ['lb', 'clearlog', 'world', '"my', 'world', 'of', 'swag"']
|
* Converts a list of arguments e.g ['lb', 'clearlog', 'world', '"my', 'world', 'of', 'swag"']
|
||||||
* into a list of arguments with any text encapsulated by quotes treated as one word
|
* into a list of arguments with any text encapsulated by quotes treated as one word
|
||||||
* For this particular example: ['lb', 'clearlog', 'world', '"my world of swag"']
|
* For this particular example: ['lb', 'clearlog', 'world', '"my world of swag"']
|
||||||
*
|
*
|
||||||
* @param args The list of arguments
|
* @param args The list of arguments
|
||||||
* @return A new list with the quoted arguments parsed to single values
|
* @return A new list with the quoted arguments parsed to single values
|
||||||
*/
|
*/
|
||||||
public static List<String> parseQuotes(List<String> args) {
|
public static List<String> parseQuotes(List<String> args) {
|
||||||
List<String> newArguments = new ArrayList<>();
|
List<String> newArguments = new ArrayList<>();
|
||||||
String subjectString = join(args.toArray(new String[args.size()]), " ");
|
String subjectString = join(args.toArray(new String[args.size()]), " ");
|
||||||
|
|
||||||
Pattern regex = Pattern.compile("[^\\s\"']+|\"[^\"]*\"|'[^']*'");
|
Pattern regex = Pattern.compile("[^\\s\"']+|\"[^\"]*\"|'[^']*'");
|
||||||
Matcher regexMatcher = regex.matcher(subjectString);
|
Matcher regexMatcher = regex.matcher(subjectString);
|
||||||
while (regexMatcher.find()) {
|
while (regexMatcher.find()) {
|
||||||
newArguments.add(regexMatcher.group());
|
newArguments.add(regexMatcher.group());
|
||||||
}
|
}
|
||||||
|
|
||||||
return newArguments;
|
return newArguments;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class ExtensionFilenameFilter implements FilenameFilter {
|
public static class ExtensionFilenameFilter implements FilenameFilter {
|
||||||
private final String ext;
|
private final String ext;
|
||||||
|
|
||||||
public ExtensionFilenameFilter(String ext) {
|
public ExtensionFilenameFilter(String ext) {
|
||||||
this.ext = "." + ext;
|
this.ext = "." + ext;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean accept(File dir, String name) {
|
public boolean accept(File dir, String name) {
|
||||||
return name.toLowerCase().endsWith(ext);
|
return name.toLowerCase().endsWith(ext);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private final static char[] hexArray = "0123456789ABCDEF".toCharArray();
|
private final static char[] hexArray = "0123456789ABCDEF".toCharArray();
|
||||||
|
|
||||||
public static String mysqlEscapeBytes(byte[] bytes) {
|
public static String mysqlEscapeBytes(byte[] bytes) {
|
||||||
char[] hexChars = new char[bytes.length * 2 + 2];
|
char[] hexChars = new char[bytes.length * 2 + 2];
|
||||||
hexChars[0] = '0';
|
hexChars[0] = '0';
|
||||||
hexChars[1] = 'x';
|
hexChars[1] = 'x';
|
||||||
for (int j = 0; j < bytes.length; j++) {
|
for (int j = 0; j < bytes.length; j++) {
|
||||||
int v = bytes[j] & 0xFF;
|
int v = bytes[j] & 0xFF;
|
||||||
hexChars[j * 2 + 2] = hexArray[v >>> 4];
|
hexChars[j * 2 + 2] = hexArray[v >>> 4];
|
||||||
hexChars[j * 2 + 3] = hexArray[v & 0x0F];
|
hexChars[j * 2 + 3] = hexArray[v & 0x0F];
|
||||||
}
|
}
|
||||||
return new String(hexChars);
|
return new String(hexChars);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String mysqlPrepareBytesForInsertAllowNull(byte[] bytes) {
|
public static String mysqlPrepareBytesForInsertAllowNull(byte[] bytes) {
|
||||||
if (bytes == null) {
|
if (bytes == null) {
|
||||||
return "null";
|
return "null";
|
||||||
}
|
}
|
||||||
return "'" + mysqlEscapeBytes(bytes) + "'";
|
return "'" + mysqlEscapeBytes(bytes) + "'";
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String mysqlTextEscape(String untrusted) {
|
public static String mysqlTextEscape(String untrusted) {
|
||||||
return untrusted.replace("\\", "\\\\").replace("'", "\\'");
|
return untrusted.replace("\\", "\\\\").replace("'", "\\'");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ItemStack loadItemStack(byte[] data) {
|
public static ItemStack loadItemStack(byte[] data) {
|
||||||
if (data == null || data.length == 0) {
|
if (data == null || data.length == 0) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
YamlConfiguration conf = deserializeYamlConfiguration(data);
|
YamlConfiguration conf = deserializeYamlConfiguration(data);
|
||||||
return conf == null ? null : conf.getItemStack("stack");
|
return conf == null ? null : conf.getItemStack("stack");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static byte[] saveItemStack(ItemStack stack) {
|
public static byte[] saveItemStack(ItemStack stack) {
|
||||||
if (stack == null || BukkitUtils.isEmpty(stack.getType())) {
|
if (stack == null || BukkitUtils.isEmpty(stack.getType())) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
YamlConfiguration conf = new YamlConfiguration();
|
YamlConfiguration conf = new YamlConfiguration();
|
||||||
conf.set("stack", stack);
|
conf.set("stack", stack);
|
||||||
return serializeYamlConfiguration(conf);
|
return serializeYamlConfiguration(conf);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static YamlConfiguration deserializeYamlConfiguration(byte[] data) {
|
public static YamlConfiguration deserializeYamlConfiguration(byte[] data) {
|
||||||
if (data == null || data.length == 0) {
|
if (data == null || data.length == 0) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
YamlConfiguration conf = new YamlConfiguration();
|
YamlConfiguration conf = new YamlConfiguration();
|
||||||
try {
|
try {
|
||||||
InputStreamReader reader = new InputStreamReader(new GZIPInputStream(new ByteArrayInputStream(data)), "UTF-8");
|
InputStreamReader reader = new InputStreamReader(new GZIPInputStream(new ByteArrayInputStream(data)), "UTF-8");
|
||||||
conf.load(reader);
|
conf.load(reader);
|
||||||
reader.close();
|
reader.close();
|
||||||
return conf;
|
return conf;
|
||||||
} catch (ZipException | InvalidConfigurationException e) {
|
} catch (ZipException | InvalidConfigurationException e) {
|
||||||
LogBlock.getInstance().getLogger().warning("Could not deserialize YamlConfiguration: " + e.getMessage());
|
LogBlock.getInstance().getLogger().warning("Could not deserialize YamlConfiguration: " + e.getMessage());
|
||||||
return conf;
|
return conf;
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw new RuntimeException("IOException should be impossible for ByteArrayInputStream", e);
|
throw new RuntimeException("IOException should be impossible for ByteArrayInputStream", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static byte[] serializeYamlConfiguration(YamlConfiguration conf) {
|
public static byte[] serializeYamlConfiguration(YamlConfiguration conf) {
|
||||||
if (conf == null || conf.getKeys(false).isEmpty()) {
|
if (conf == null || conf.getKeys(false).isEmpty()) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||||
OutputStreamWriter writer = new OutputStreamWriter(new GZIPOutputStream(baos), "UTF-8");
|
OutputStreamWriter writer = new OutputStreamWriter(new GZIPOutputStream(baos), "UTF-8");
|
||||||
writer.write(conf.saveToString());
|
writer.write(conf.saveToString());
|
||||||
writer.close();
|
writer.close();
|
||||||
return baos.toByteArray();
|
return baos.toByteArray();
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw new RuntimeException("IOException should be impossible for ByteArrayOutputStream", e);
|
throw new RuntimeException("IOException should be impossible for ByteArrayOutputStream", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String serializeForSQL(YamlConfiguration conf) {
|
public static String serializeForSQL(YamlConfiguration conf) {
|
||||||
return mysqlPrepareBytesForInsertAllowNull(serializeYamlConfiguration(conf));
|
return mysqlPrepareBytesForInsertAllowNull(serializeYamlConfiguration(conf));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double warpDegrees(double degrees) {
|
public static double warpDegrees(double degrees) {
|
||||||
double d = degrees % 360.0;
|
double d = degrees % 360.0;
|
||||||
if (d >= 180.0) {
|
if (d >= 180.0) {
|
||||||
d -= 360.0;
|
d -= 360.0;
|
||||||
}
|
}
|
||||||
if (d < -180.0) {
|
if (d < -180.0) {
|
||||||
d += 360.0;
|
d += 360.0;
|
||||||
}
|
}
|
||||||
return d;
|
return d;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user