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

v9: hMod 130+ updates

Browse Source
This commit is contained in:
bootswithdefer
2010-12-03 08:31:00 -07:00
parent fa3cc24bb6
commit 1224b148a8
1 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
LogBlock.java
View File

@@ -16,7 +16,7 @@ import net.minecraft.server.MinecraftServer;
public class LogBlock extends Plugin public class LogBlock extends Plugin
{ {
private static String name = "LogBlock"; private static String name = "LogBlock";
private static int version = 8; private static int version = 9;
private boolean debug = false; private boolean debug = false;
private String dbDriver = "com.mysql.jdbc.Driver"; private String dbDriver = "com.mysql.jdbc.Driver";
private String dbUrl = ""; private String dbUrl = "";
@@ -26,6 +26,7 @@ public class LogBlock extends Plugin
private int defaultDist = 20; private int defaultDist = 20;
private int toolID = 270; // 270 is wood pick private int toolID = 270; // 270 is wood pick
private Consumer consumer = null; private Consumer consumer = null;
private Block lastface = null;
private LinkedBlockingQueue<BlockRow> bqueue = new LinkedBlockingQueue<BlockRow>(); private LinkedBlockingQueue<BlockRow> bqueue = new LinkedBlockingQueue<BlockRow>();
@@ -82,7 +83,8 @@ public class LogBlock extends Plugin
LBListener listener = new LBListener(); LBListener listener = new LBListener();
etc.getLoader().addListener(PluginLoader.Hook.COMMAND, listener, this, PluginListener.Priority.LOW); etc.getLoader().addListener(PluginLoader.Hook.COMMAND, listener, this, PluginListener.Priority.LOW);
etc.getLoader().addListener(PluginLoader.Hook.BLOCK_CREATED, listener, this, PluginListener.Priority.LOW); etc.getLoader().addListener(PluginLoader.Hook.BLOCK_RIGHTCLICKED, listener, this, PluginListener.Priority.LOW);
etc.getLoader().addListener(PluginLoader.Hook.BLOCK_PLACE, listener, this, PluginListener.Priority.LOW);
etc.getLoader().addListener(PluginLoader.Hook.BLOCK_BROKEN, listener, this, PluginListener.Priority.LOW); etc.getLoader().addListener(PluginLoader.Hook.BLOCK_BROKEN, listener, this, PluginListener.Priority.LOW);
} }
@@ -385,15 +387,24 @@ public class LogBlock extends Plugin
private void queueBlock(Player player, Block before, Block after) private void queueBlock(Player player, Block before, Block after)
{ {
int type = 0; Block b = null;
if (after != null) { int typeA = 0;
type = after.getType(); int typeB = 0;
if (type < 0) if (after != null)
return; {
typeA = after.getType();
b = after;
} }
if (before.getType() < 0) if (before != null)
{
typeB = before.getType();
b = before;
}
if (b == null || typeA < 0 || typeB < 0)
return; return;
BlockRow row = new BlockRow(player.getName(), before.getType(), type, before.getX(), before.getY(), before.getZ());
BlockRow row = new BlockRow(player.getName(), typeB, typeA, b.getX(), b.getY(), b.getZ());
boolean result = bqueue.offer(row); boolean result = bqueue.offer(row);
if (debug) if (debug)
lblog.info(row.toString()); lblog.info(row.toString());
@@ -437,20 +448,22 @@ public class LogBlock extends Plugin
return false; return false;
} }
public boolean onBlockCreate(Player player, Block blockPlaced, Block blockClicked, int itemInHand) public void onBlockRightClicked(Player player, Block blockClicked, Item item)
{ {
if (itemInHand == toolID && player.canUseCommand("/blockhistory")) if (item.getItemId() == toolID && player.canUseCommand("/blockhistory"))
{
showBlockHistory(player, blockClicked); showBlockHistory(player, blockClicked);
return true;
}
Block before = new Block(etc.getServer().getBlockIdAt(blockPlaced.getX(), blockPlaced.getY(), blockPlaced.getZ()), blockPlaced.getX(), blockPlaced.getY(), blockPlaced.getZ()); lastface = blockClicked.getFace(blockClicked.getFaceClicked());
// if (debug)
// lblog.info("onBlockRightClicked: clicked " + blockClicked.getType() + " item " + item.getItemId() + " face " + blockClicked.getFace(blockClicked.getFaceClicked()).getType());
}
if (before.getType() == blockPlaced.getType()) public boolean onBlockPlace(Player player, Block blockPlaced, Block blockClicked, Item itemInHand)
return false; {
// if (debug)
// lblog.info("onBlockPlace: placed " + blockPlaced.getType() + " clicked " + blockClicked.getType() + " item " + itemInHand.getItemId());
queueBlock(player, before, blockPlaced); queueBlock(player, lastface, blockPlaced);
return false; return false;
} }