From 16ca190ee5bdb4dbcec36698ef1c4e608ea84db2 Mon Sep 17 00:00:00 2001 From: Thorinwasher Date: Sun, 28 Mar 2021 12:48:20 +0200 Subject: [PATCH] fixed something with event priority also Changed some classnames for clarity --- pom.xml | 4 ++-- src/main/java/com/mcsmp/ParamnesticCure.java | 17 ++++++++--------- .../{WorldTracker.java => WorldListener.java} | 4 ++-- .../{BlockTracker.java => BlockListener.java} | 15 ++++++++------- ...CommandTracker.java => CommandListener.java} | 8 ++++---- 5 files changed, 24 insertions(+), 24 deletions(-) rename src/main/java/com/mcsmp/{WorldTracker.java => WorldListener.java} (95%) rename src/main/java/com/mcsmp/block/{BlockTracker.java => BlockListener.java} (93%) rename src/main/java/com/mcsmp/commands/{CommandTracker.java => CommandListener.java} (97%) diff --git a/pom.xml b/pom.xml index b45d9ae..a10ab18 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mcsmp ParamnesticCure - 1.0.0 + 1.0.1 jar UTF-8 @@ -31,7 +31,7 @@ me.prunt.restrictedcreative RestrictedCreativeAPI - 2.4.7 + 2.4.8 provided diff --git a/src/main/java/com/mcsmp/ParamnesticCure.java b/src/main/java/com/mcsmp/ParamnesticCure.java index 0cade87..f238ac8 100644 --- a/src/main/java/com/mcsmp/ParamnesticCure.java +++ b/src/main/java/com/mcsmp/ParamnesticCure.java @@ -27,8 +27,8 @@ import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; -import com.mcsmp.block.BlockTracker; -import com.mcsmp.commands.CommandTracker; +import com.mcsmp.block.BlockListener; +import com.mcsmp.commands.CommandListener; import com.mcsmp.database.SqlManager; import net.coreprotect.CoreProtect; @@ -52,7 +52,8 @@ public class ParamnesticCure extends JavaPlugin { @Override public void onEnable() { - //sets so that any external methods that need to log messages wont get any errors + + //sets instance. instance = this; @@ -66,9 +67,9 @@ public class ParamnesticCure extends JavaPlugin { this.saveDefaultConfig(); PluginManager pluginManager = this.getServer().getPluginManager(); - pluginManager.registerEvents(new CommandTracker(this), this); - pluginManager.registerEvents(new BlockTracker(),this); - pluginManager.registerEvents(new WorldTracker(),this); + pluginManager.registerEvents(new CommandListener(this), this); + pluginManager.registerEvents(new BlockListener(),this); + pluginManager.registerEvents(new WorldListener(),this); log = getLogger(); @@ -110,8 +111,6 @@ public class ParamnesticCure extends JavaPlugin { createDB(); isDebug = getConfig().getBoolean("Plugin_settings.debug"); - //sets instance. - instance = this; } @Override @@ -159,7 +158,7 @@ public class ParamnesticCure extends JavaPlugin { List worldlist = getServer().getWorlds(); for(World world : worldlist) { - WorldTracker.addWorldToDB(world); + WorldListener.addWorldToDB(world); } } /** diff --git a/src/main/java/com/mcsmp/WorldTracker.java b/src/main/java/com/mcsmp/WorldListener.java similarity index 95% rename from src/main/java/com/mcsmp/WorldTracker.java rename to src/main/java/com/mcsmp/WorldListener.java index c764521..c9819c4 100644 --- a/src/main/java/com/mcsmp/WorldTracker.java +++ b/src/main/java/com/mcsmp/WorldListener.java @@ -20,14 +20,14 @@ import org.bukkit.event.world.WorldInitEvent; * @author Thorin * */ -public class WorldTracker implements Listener { +public class WorldListener implements Listener { /** * If a world get created, its name needs to get stored in the database. TODO I should also add something that tracks if the world was renamed * @param event */ @EventHandler public void worldInit(WorldInitEvent event) { - WorldTracker.addWorldToDB(event.getWorld()); + WorldListener.addWorldToDB(event.getWorld()); } /** * Adds the world to the worlds table, which will assign it an id diff --git a/src/main/java/com/mcsmp/block/BlockTracker.java b/src/main/java/com/mcsmp/block/BlockListener.java similarity index 93% rename from src/main/java/com/mcsmp/block/BlockTracker.java rename to src/main/java/com/mcsmp/block/BlockListener.java index 9196e11..7b59fb9 100644 --- a/src/main/java/com/mcsmp/block/BlockTracker.java +++ b/src/main/java/com/mcsmp/block/BlockListener.java @@ -16,12 +16,13 @@ import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.block.data.Bisected; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockPlaceEvent; import com.mcsmp.ParamnesticCure; -import com.mcsmp.WorldTracker; +import com.mcsmp.WorldListener; import me.prunt.restrictedcreative.RestrictedCreativeAPI; import net.coreprotect.CoreProtectAPI; @@ -32,7 +33,7 @@ import net.coreprotect.CoreProtectAPI.ParseResult; * @author Frostalf * @author Thorin */ -public class BlockTracker implements Listener { +public class BlockListener implements Listener { private static ParamnesticCure plugin = ParamnesticCure.getInstance(); private static CoreProtectAPI coreprotect = plugin.getCoreProtect(); @@ -41,14 +42,14 @@ public class BlockTracker implements Listener { /** * @param event BlockBreakEvent */ - @EventHandler + @EventHandler(ignoreCancelled = true,priority = EventPriority.MONITOR) public void onBlockBreak(BlockBreakEvent event) { generalBlockEventTrigger(event.getBlock(),true); } /** * @param event BlockPlaceEvent */ - @EventHandler + @EventHandler(ignoreCancelled = true,priority = EventPriority.MONITOR) public void onBlockPlace(BlockPlaceEvent event) { generalBlockEventTrigger(event.getBlock(),false); } @@ -78,7 +79,7 @@ public class BlockTracker implements Listener { if(!isCreative) return; - BlockTracker.updateCreativeID(block,isCreative); + BlockListener.updateCreativeID(block,isCreative); /* @@ -92,7 +93,7 @@ public class BlockTracker implements Listener { else loc = loc.add(0,-1,0); - BlockTracker.updateCreativeID(loc.getBlock(),isCreative); + BlockListener.updateCreativeID(loc.getBlock(),isCreative); } } },waitPeriod); @@ -148,7 +149,7 @@ public class BlockTracker implements Listener { ); statement.setInt( 1, time); - statement.setInt( 2, WorldTracker.getWorldId( block.getWorld().getName()) ); + statement.setInt( 2, WorldListener.getWorldId( block.getWorld().getName()) ); statement.setInt( 3, block.getX()); statement.setInt( 4, block.getY()); statement.setInt( 5, block.getZ()); diff --git a/src/main/java/com/mcsmp/commands/CommandTracker.java b/src/main/java/com/mcsmp/commands/CommandListener.java similarity index 97% rename from src/main/java/com/mcsmp/commands/CommandTracker.java rename to src/main/java/com/mcsmp/commands/CommandListener.java index f6f52e7..7b50b46 100644 --- a/src/main/java/com/mcsmp/commands/CommandTracker.java +++ b/src/main/java/com/mcsmp/commands/CommandListener.java @@ -22,7 +22,7 @@ import org.bukkit.event.server.ServerCommandEvent; import com.mcsmp.MessageManager; import com.mcsmp.ParamnesticCure; -import com.mcsmp.block.BlockTracker; +import com.mcsmp.block.BlockListener; import com.mcsmp.block.RestoreManager; import com.mcsmp.block.RollbackManager; @@ -31,7 +31,7 @@ import com.mcsmp.block.RollbackManager; * @author Frostalf * @author Thorin */ -public class CommandTracker implements Listener { +public class CommandListener implements Listener { private static HashMap storedCommands = new HashMap(); @@ -42,7 +42,7 @@ public class CommandTracker implements Listener { * Constructor class * @param plugin Instance of the plugin. */ - public CommandTracker(ParamnesticCure plugin) { + public CommandListener(ParamnesticCure plugin) { // configSektion = plugin.getConfig().getConfigurationSection(""); } @@ -170,7 +170,7 @@ public class CommandTracker implements Listener { //don't look here, this is stupid String[] temp = {command[2]}; int time = (new RollbackManager(temp,null,null)).getTime(); - BlockTracker.purgeDatabase(time); + BlockListener.purgeDatabase(time); } List helpAlias = configSektion.getStringList("blockLoggerCommands.help"); if(helpAlias.contains(command[1]) && PermissionManager.hasHelp(playerOperator)) {