forked from LogBlock/LogBlock
Reformat the entire project:
Use of braces is now enforced EVERYWHERE Switched to 4spaces instead of tabs
This commit is contained in:
Ammar Askar
@@ -6,14 +6,12 @@ import com.sk89q.worldedit.WorldEdit;
|
||||
import com.sk89q.worldedit.blocks.BaseBlock;
|
||||
import com.sk89q.worldedit.bukkit.BukkitWorld;
|
||||
import com.sk89q.worldedit.event.extent.EditSessionEvent;
|
||||
//...so they ALSO have a class called Actor... need to fully-qualify when we use ours
|
||||
import com.sk89q.worldedit.extension.platform.Actor;
|
||||
import com.sk89q.worldedit.extent.logging.AbstractLoggingExtent;
|
||||
import com.sk89q.worldedit.util.eventbus.Subscribe;
|
||||
import de.diddiz.LogBlock.LogBlock;
|
||||
import de.diddiz.LogBlock.Logging;
|
||||
import de.diddiz.LogBlock.config.Config;
|
||||
import java.util.logging.Level;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
@@ -22,93 +20,103 @@ import org.bukkit.block.Block;
|
||||
import org.bukkit.block.BlockState;
|
||||
import org.bukkit.block.Sign;
|
||||
|
||||
import java.util.logging.Level;
|
||||
|
||||
//...so they ALSO have a class called Actor... need to fully-qualify when we use ours
|
||||
|
||||
public class WorldEditLoggingHook {
|
||||
|
||||
private LogBlock plugin;
|
||||
private LogBlock plugin;
|
||||
|
||||
public WorldEditLoggingHook(LogBlock plugin) {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
public WorldEditLoggingHook(LogBlock plugin) {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
// Convert WE Actor to LB Actor
|
||||
private de.diddiz.LogBlock.Actor AtoA(Actor weActor) {
|
||||
if (weActor.isPlayer()) {
|
||||
return new de.diddiz.LogBlock.Actor(weActor.getName(),weActor.getUniqueId());
|
||||
}
|
||||
return new de.diddiz.LogBlock.Actor(weActor.getName());
|
||||
}
|
||||
// Convert WE Actor to LB Actor
|
||||
private de.diddiz.LogBlock.Actor AtoA(Actor weActor) {
|
||||
if (weActor.isPlayer()) {
|
||||
return new de.diddiz.LogBlock.Actor(weActor.getName(), weActor.getUniqueId());
|
||||
}
|
||||
return new de.diddiz.LogBlock.Actor(weActor.getName());
|
||||
}
|
||||
|
||||
private World adapt(com.sk89q.worldedit.world.World weWorld) {
|
||||
if (weWorld == null) {
|
||||
throw new NullPointerException("[Logblock-Worldedit] The provided world was null.");
|
||||
}
|
||||
if (weWorld instanceof BukkitWorld) return ((BukkitWorld) weWorld).getWorld();
|
||||
World world = Bukkit.getServer().getWorld(weWorld.getName());
|
||||
if (world == null) throw new IllegalArgumentException("Can't find a Bukkit world for " + weWorld);
|
||||
return world;
|
||||
}
|
||||
private World adapt(com.sk89q.worldedit.world.World weWorld) {
|
||||
if (weWorld == null) {
|
||||
throw new NullPointerException("[Logblock-Worldedit] The provided world was null.");
|
||||
}
|
||||
if (weWorld instanceof BukkitWorld) {
|
||||
return ((BukkitWorld) weWorld).getWorld();
|
||||
}
|
||||
World world = Bukkit.getServer().getWorld(weWorld.getName());
|
||||
if (world == null) {
|
||||
throw new IllegalArgumentException("Can't find a Bukkit world for " + weWorld);
|
||||
}
|
||||
return world;
|
||||
}
|
||||
|
||||
public void hook() {
|
||||
WorldEdit.getInstance().getEventBus().register(new Object() {
|
||||
@Subscribe
|
||||
public void wrapForLogging(final EditSessionEvent event) {
|
||||
final Actor actor = event.getActor();
|
||||
if (actor == null ) return;
|
||||
final de.diddiz.LogBlock.Actor lbActor = AtoA(actor);
|
||||
public void hook() {
|
||||
WorldEdit.getInstance().getEventBus().register(new Object() {
|
||||
@Subscribe
|
||||
public void wrapForLogging(final EditSessionEvent event) {
|
||||
final Actor actor = event.getActor();
|
||||
if (actor == null) {
|
||||
return;
|
||||
}
|
||||
final de.diddiz.LogBlock.Actor lbActor = AtoA(actor);
|
||||
|
||||
// Check to ensure the world should be logged
|
||||
final World world;
|
||||
final com.sk89q.worldedit.world.World k = event.getWorld();
|
||||
try {
|
||||
world = adapt(k);
|
||||
} catch (RuntimeException ex) {
|
||||
plugin.getLogger().warning("Failed to register logging for WorldEdit!");
|
||||
plugin.getLogger().log(Level.WARNING, ex.getMessage(),ex);
|
||||
return;
|
||||
}
|
||||
// Check to ensure the world should be logged
|
||||
final World world;
|
||||
final com.sk89q.worldedit.world.World k = event.getWorld();
|
||||
try {
|
||||
world = adapt(k);
|
||||
} catch (RuntimeException ex) {
|
||||
plugin.getLogger().warning("Failed to register logging for WorldEdit!");
|
||||
plugin.getLogger().log(Level.WARNING, ex.getMessage(), ex);
|
||||
return;
|
||||
}
|
||||
|
||||
// If config becomes reloadable, this check should be moved
|
||||
if (!(Config.isLogging(world, Logging.WORLDEDIT))) {
|
||||
return;
|
||||
}
|
||||
|
||||
event.setExtent(new AbstractLoggingExtent(event.getExtent()) {
|
||||
@Override
|
||||
protected void onBlockChange(Vector pt, BaseBlock block) {
|
||||
// If config becomes reloadable, this check should be moved
|
||||
if (!(Config.isLogging(world, Logging.WORLDEDIT))) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (event.getStage() != EditSession.Stage.BEFORE_CHANGE) {
|
||||
return;
|
||||
}
|
||||
event.setExtent(new AbstractLoggingExtent(event.getExtent()) {
|
||||
@Override
|
||||
protected void onBlockChange(Vector pt, BaseBlock block) {
|
||||
|
||||
Location location = new Location(world, pt.getBlockX(), pt.getBlockY(), pt.getBlockZ());
|
||||
Block origin = location.getBlock();
|
||||
int typeBefore = origin.getTypeId();
|
||||
byte dataBefore = origin.getData();
|
||||
// If we're dealing with a sign, store the block state to read the text off
|
||||
BlockState stateBefore = null;
|
||||
if (typeBefore == Material.SIGN_POST.getId() || typeBefore == Material.SIGN.getId()) {
|
||||
stateBefore = origin.getState();
|
||||
}
|
||||
if (event.getStage() != EditSession.Stage.BEFORE_CHANGE) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Check to see if we've broken a sign
|
||||
if (Config.isLogging(location.getWorld().getName(), Logging.SIGNTEXT) && (typeBefore == Material.SIGN_POST.getId() || typeBefore == Material.SIGN.getId())) {
|
||||
plugin.getConsumer().queueSignBreak(lbActor, (Sign) stateBefore);
|
||||
if (block.getType() != Material.AIR.getId()) {
|
||||
plugin.getConsumer().queueBlockPlace(lbActor, location, block.getType(), (byte) block.getData());
|
||||
}
|
||||
} else {
|
||||
if (dataBefore != 0) {
|
||||
plugin.getConsumer().queueBlockBreak(lbActor, location, typeBefore, dataBefore);
|
||||
if (block.getType() != Material.AIR.getId()) {
|
||||
plugin.getConsumer().queueBlockPlace(lbActor, location, block.getType(), (byte) block.getData());
|
||||
}
|
||||
} else {
|
||||
plugin.getConsumer().queueBlock(lbActor, location, typeBefore, block.getType(), (byte) block.getData());
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
Location location = new Location(world, pt.getBlockX(), pt.getBlockY(), pt.getBlockZ());
|
||||
Block origin = location.getBlock();
|
||||
int typeBefore = origin.getTypeId();
|
||||
byte dataBefore = origin.getData();
|
||||
// If we're dealing with a sign, store the block state to read the text off
|
||||
BlockState stateBefore = null;
|
||||
if (typeBefore == Material.SIGN_POST.getId() || typeBefore == Material.SIGN.getId()) {
|
||||
stateBefore = origin.getState();
|
||||
}
|
||||
|
||||
// Check to see if we've broken a sign
|
||||
if (Config.isLogging(location.getWorld().getName(), Logging.SIGNTEXT) && (typeBefore == Material.SIGN_POST.getId() || typeBefore == Material.SIGN.getId())) {
|
||||
plugin.getConsumer().queueSignBreak(lbActor, (Sign) stateBefore);
|
||||
if (block.getType() != Material.AIR.getId()) {
|
||||
plugin.getConsumer().queueBlockPlace(lbActor, location, block.getType(), (byte) block.getData());
|
||||
}
|
||||
} else {
|
||||
if (dataBefore != 0) {
|
||||
plugin.getConsumer().queueBlockBreak(lbActor, location, typeBefore, dataBefore);
|
||||
if (block.getType() != Material.AIR.getId()) {
|
||||
plugin.getConsumer().queueBlockPlace(lbActor, location, block.getType(), (byte) block.getData());
|
||||
}
|
||||
} else {
|
||||
plugin.getConsumer().queueBlock(lbActor, location, typeBefore, block.getType(), (byte) block.getData());
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user