diff options
43 files changed, 2273 insertions, 867 deletions
diff --git a/BuildAll/nbproject/build-impl.xml b/BuildAll/nbproject/build-impl.xml index 09a0e0d9d..dd0e3d5e1 100644 --- a/BuildAll/nbproject/build-impl.xml +++ b/BuildAll/nbproject/build-impl.xml @@ -630,6 +630,13 @@ is divided into following sections: </antcall>
<antcall target="-maybe-call-dep">
<param name="call.built.properties" value="${built-jar.properties}"/>
+ <param location="${project.EssentialsServerlist}" name="call.subproject"/>
+ <param location="${project.EssentialsServerlist}/build.xml" name="call.script"/>
+ <param name="call.target" value="jar"/>
+ <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
+ </antcall>
+ <antcall target="-maybe-call-dep">
+ <param name="call.built.properties" value="${built-jar.properties}"/>
<param location="${project.EssentialsSpawn}" name="call.subproject"/>
<param location="${project.EssentialsSpawn}/build.xml" name="call.script"/>
<param name="call.target" value="jar"/>
@@ -1108,6 +1115,13 @@ is divided into following sections: </antcall>
<antcall target="-maybe-call-dep">
<param name="call.built.properties" value="${built-clean.properties}"/>
+ <param location="${project.EssentialsServerlist}" name="call.subproject"/>
+ <param location="${project.EssentialsServerlist}/build.xml" name="call.script"/>
+ <param name="call.target" value="clean"/>
+ <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
+ </antcall>
+ <antcall target="-maybe-call-dep">
+ <param name="call.built.properties" value="${built-clean.properties}"/>
<param location="${project.EssentialsSpawn}" name="call.subproject"/>
<param location="${project.EssentialsSpawn}/build.xml" name="call.script"/>
<param name="call.target" value="clean"/>
diff --git a/BuildAll/nbproject/genfiles.properties b/BuildAll/nbproject/genfiles.properties index 55c9a217a..7775180ad 100644 --- a/BuildAll/nbproject/genfiles.properties +++ b/BuildAll/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=60061751
+build.xml.data.CRC32=36e85771
build.xml.script.CRC32=7a797370
build.xml.stylesheet.CRC32=28e38971@1.42.1.45
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=60061751
-nbproject/build-impl.xml.script.CRC32=5fce336c
+nbproject/build-impl.xml.data.CRC32=36e85771
+nbproject/build-impl.xml.script.CRC32=eaedfa13
nbproject/build-impl.xml.stylesheet.CRC32=19debb58@1.42.1.45
diff --git a/BuildAll/nbproject/project.properties b/BuildAll/nbproject/project.properties index 6b8e235e1..e598ad76c 100644 --- a/BuildAll/nbproject/project.properties +++ b/BuildAll/nbproject/project.properties @@ -34,6 +34,7 @@ javac.classpath=\ ${reference.EssentialsGroupBridge.jar}:\
${reference.EssentialsGroupManager.jar}:\
${reference.EssentialsProtect.jar}:\
+ ${reference.EssentialsServerlist.jar}:\
${reference.EssentialsSpawn.jar}
# Space-separated list of extra javac options
javac.compilerargs=
@@ -68,12 +69,14 @@ project.EssentialsChat=../EssentialsChat project.EssentialsGroupBridge=../EssentialsGroupBridge
project.EssentialsGroupManager=../EssentialsGroupManager
project.EssentialsProtect=../EssentialsProtect
+project.EssentialsServerlist=../EssentialsServerlist
project.EssentialsSpawn=../EssentialsSpawn
reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
reference.EssentialsChat.jar=${project.EssentialsChat}/dist/EssentialsChat.jar
reference.EssentialsGroupBridge.jar=${project.EssentialsGroupBridge}/dist/EssentialsGroupBridge.jar
reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar
reference.EssentialsProtect.jar=${project.EssentialsProtect}/dist/original-EssentialsProtect.jar
+reference.EssentialsServerlist.jar=${project.EssentialsServerlist}/dist/EssentialsServerlist.jar
reference.EssentialsSpawn.jar=${project.EssentialsSpawn}/dist/EssentialsSpawn.jar
run.classpath=\
${javac.classpath}:\
diff --git a/BuildAll/nbproject/project.xml b/BuildAll/nbproject/project.xml index 86e1cc4a7..8f87bed74 100644 --- a/BuildAll/nbproject/project.xml +++ b/BuildAll/nbproject/project.xml @@ -56,6 +56,14 @@ <id>jar</id>
</reference>
<reference>
+ <foreign-project>EssentialsServerlist</foreign-project>
+ <artifact-type>jar</artifact-type>
+ <script>build.xml</script>
+ <target>jar</target>
+ <clean-target>clean</clean-target>
+ <id>jar</id>
+ </reference>
+ <reference>
<foreign-project>EssentialsSpawn</foreign-project>
<artifact-type>jar</artifact-type>
<script>build.xml</script>
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index f9bd1d655..775b29c35 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -38,6 +38,7 @@ public class Essentials extends JavaPlugin private EssentialsPlayerListener playerListener; private EssentialsBlockListener blockListener; private EssentialsEntityListener entityListener; + private JailPlayerListener jailPlayerListener; private static Essentials staticThis = null; public Spawn spawn; private Jail jail; @@ -159,7 +160,7 @@ public class Essentials extends JavaPlugin pm.registerEvent(Type.PLAYER_MOVE, playerListener, Priority.High, this); pm.registerEvent(Type.PLAYER_LOGIN, playerListener, Priority.High, this); pm.registerEvent(Type.PLAYER_TELEPORT, playerListener, Priority.High, this); - pm.registerEvent(Type.PLAYER_INTERACT, playerListener, Priority.Monitor, this); + pm.registerEvent(Type.PLAYER_INTERACT, playerListener, Priority.High, this); blockListener = new EssentialsBlockListener(this); pm.registerEvent(Type.SIGN_CHANGE, blockListener, Priority.Monitor, this); @@ -172,11 +173,12 @@ public class Essentials extends JavaPlugin pm.registerEvent(Type.ENTITY_DEATH, entityListener, Priority.Lowest, this); jail = new Jail(this.getDataFolder()); + jailPlayerListener = new JailPlayerListener(this); confList.add(jail); pm.registerEvent(Type.BLOCK_BREAK, jail, Priority.High, this); pm.registerEvent(Type.BLOCK_DAMAGE, jail, Priority.High, this); pm.registerEvent(Type.BLOCK_PLACE, jail, Priority.High, this); - + pm.registerEvent(Type.PLAYER_INTERACT, jailPlayerListener, Priority.High, this); attachEcoListeners(); if (settings.isNetherEnabled() && getServer().getWorlds().size() < 2) @@ -662,9 +664,11 @@ public class Essentials extends JavaPlugin private void attachEcoListeners() { PluginManager pm = getServer().getPluginManager(); - EssentialsEcoBlockListener blockListener = new EssentialsEcoBlockListener(); - pm.registerEvent(Type.BLOCK_BREAK, blockListener, Priority.High, this); - pm.registerEvent(Type.SIGN_CHANGE, blockListener, Priority.Monitor, this); + EssentialsEcoBlockListener ecoBlockListener = new EssentialsEcoBlockListener(); + EssentialsEcoPlayerListener ecoPlayerListener = new EssentialsEcoPlayerListener(); + pm.registerEvent(Type.PLAYER_INTERACT, ecoPlayerListener, Priority.High, this); + pm.registerEvent(Type.BLOCK_BREAK, ecoBlockListener, Priority.High, this); + pm.registerEvent(Type.SIGN_CHANGE, ecoBlockListener, Priority.Monitor, this); } public CraftScheduler getScheduler() diff --git a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java index a52a6c225..ae480f16b 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java @@ -1,10 +1,15 @@ package com.earth2me.essentials; import java.util.ArrayList; +import java.util.List; +import net.minecraft.server.InventoryPlayer; import org.bukkit.*; import org.bukkit.block.*; import org.bukkit.craftbukkit.block.CraftSign; +import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer; +import org.bukkit.entity.Player; import org.bukkit.event.block.*; +import org.bukkit.inventory.ItemStack; public class EssentialsBlockListener extends BlockListener @@ -47,7 +52,6 @@ public class EssentialsBlockListener extends BlockListener user.sendMessage("§cYou do not have permission to destroy that sign."); } } - @Override public void onSignChange(SignChangeEvent event) { @@ -137,7 +141,7 @@ public class EssentialsBlockListener extends BlockListener private static final int ALLOWED = 1; private static final int NOSIGN = 2; - private static int checkProtectionSign(Block block, User user) + private int checkProtectionSign(Block block, User user) { if (block.getType() == Material.SIGN_POST || block.getType() == Material.WALL_SIGN) { @@ -162,7 +166,7 @@ public class EssentialsBlockListener extends BlockListener return NOSIGN; } - private static Block[] getAdjacentBlocks(Block block) + private Block[] getAdjacentBlocks(Block block) { return new Block[] { @@ -175,7 +179,7 @@ public class EssentialsBlockListener extends BlockListener }; } - public static boolean isBlockProtected(Block block, User user) + public boolean isBlockProtected(Block block, User user) { Block[] faces = getAdjacentBlocks(block); boolean protect = false; diff --git a/Essentials/src/com/earth2me/essentials/EssentialsConf.java b/Essentials/src/com/earth2me/essentials/EssentialsConf.java index 616f39a6c..124dc6fd2 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsConf.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsConf.java @@ -81,7 +81,6 @@ public class EssentialsConf extends Configuration ostr.write(buffer, 0, length); length = istr.read(buffer); } - ostr.close(); istr.close(); } catch (IOException ex) @@ -93,7 +92,9 @@ public class EssentialsConf extends Configuration { try { - ostr.close(); + if (ostr != null) { + ostr.close(); + } } catch (IOException ex) { diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java index 885985ebc..d2d0def15 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java @@ -65,6 +65,7 @@ public class EssentialsEcoBlockListener extends BlockListener } } + @Override public void onSignChange(SignChangeEvent event) { diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index 58cddcacd..812a43cfd 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -1,5 +1,6 @@ package com.earth2me.essentials; +import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; import net.minecraft.server.InventoryPlayer; @@ -7,8 +8,8 @@ import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.block.Sign; import org.bukkit.craftbukkit.block.CraftSign; -import org.bukkit.craftbukkit.inventory.CraftInventory; import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer; +import org.bukkit.event.block.Action; import org.bukkit.event.player.*; import org.bukkit.event.player.PlayerLoginEvent.Result; import org.bukkit.inventory.ItemStack; @@ -19,229 +20,14 @@ public class EssentialsPlayerListener extends PlayerListener private static final Logger logger = Logger.getLogger("Minecraft"); private final Server server; private final Essentials parent; + private EssentialsBlockListener essBlockListener = null; + public EssentialsPlayerListener(Essentials parent) { this.parent = parent; this.server = parent.getServer(); - } - - private void onPlayerInteractEco(PlayerInteractEvent event) - { - if (Essentials.getSettings().areSignsDisabled()) return; - User user = User.get(event.getPlayer()); - if (event.getClickedBlock().getType() != Material.WALL_SIGN && event.getClickedBlock().getType() != Material.SIGN_POST) - return; - Sign sign = new CraftSign(event.getClickedBlock()); - - if (sign.getLine(0).equals("§1[Buy]") && user.isAuthorized("essentials.signs.buy.use")) - { - try - { - int amount = Integer.parseInt(sign.getLine(1)); - ItemStack item = ItemDb.get(sign.getLine(2), amount); - int cost = Integer.parseInt(sign.getLine(3).substring(1)); - if (user.getMoney() < cost) throw new Exception("You do not have sufficient funds."); - user.takeMoney(cost); - user.getInventory().addItem(item); - user.updateInventory(); - } - catch (Throwable ex) - { - user.sendMessage("§cError: " + ex.getMessage()); - } - return; - } - - if (sign.getLine(0).equals("§1[Sell]") && user.isAuthorized("essentials.signs.sell.use")) - { - try - { - int amount = Integer.parseInt(sign.getLine(1)); - ItemStack item = ItemDb.get(sign.getLine(2), amount); - int cost = Integer.parseInt(sign.getLine(3).substring(1)); - if (!InventoryWorkaround.containsItem((CraftInventory)user.getInventory(), true, item)) throw new Exception("You do not have enough items to sell."); - user.giveMoney(cost); - InventoryWorkaround.removeItem((CraftInventory)user.getInventory(), true, item); - user.updateInventory(); - } - catch (Throwable ex) - { - user.sendMessage("§cError: " + ex.getMessage()); - } - return; - } - - if (sign.getLine(0).equals("§1[Trade]") && user.isAuthorized("essentials.signs.trade.use")) - { - try - { - String[] l1 = sign.getLines()[1].split("[ :-]+"); - String[] l2 = sign.getLines()[2].split("[ :-]+"); - boolean m1 = l1[0].matches("\\$[0-9]+"); - boolean m2 = l2[0].matches("\\$[0-9]+"); - int q1 = Integer.parseInt(m1 ? l1[0].substring(1) : l1[0]); - int q2 = Integer.parseInt(m2 ? l2[0].substring(1) : l2[0]); - int r1 = Integer.parseInt(l1[m1 ? 1 : 2]); - int r2 = Integer.parseInt(l2[m2 ? 1 : 2]); - r1 = r1 - r1 % q1; - r2 = r2 - r2 % q2; - if (q1 < 1 || q2 < 1) throw new Exception("Quantities must be greater than 0."); - - ItemStack i1 = m1 || r1 <= 0 ? null : ItemDb.get(l1[1], r1); - ItemStack qi1 = m1 ? null : ItemDb.get(l1[1], q1); - ItemStack qi2 = m2 ? null : ItemDb.get(l2[1], q2); - - if (user.getName().equals(sign.getLines()[3].substring(2))) - { - if (m1) - { - user.giveMoney(r1); - } - else if (i1 != null) - { - user.getInventory().addItem(i1); - user.updateInventory(); - } - r1 = 0; - sign.setLine(1, (m1 ? "$" + q1 : q1 + " " + l1[1]) + ":" + r1); - } - else - { - if (m1) - { - if (user.getMoney() < q1) - throw new Exception("You do not have sufficient funds."); - } - else - { - if (!InventoryWorkaround.containsItem((CraftInventory)user.getInventory(), true, qi1)) - throw new Exception("You do not have " + q1 + "x " + l1[1] + "."); - } - - if (r2 < q2) throw new Exception("The trade sign does not have enough supply left."); - - if (m1) - user.takeMoney(q1); - else - InventoryWorkaround.removeItem((CraftInventory)user.getInventory(), true, qi1); - - if (m2) - user.giveMoney(q2); - else - user.getInventory().addItem(qi2); - - user.updateInventory(); - - r1 += q1; - r2 -= q2; - - sign.setLine(0, "§1[Trade]"); - sign.setLine(1, (m1 ? "$" + q1 : q1 + " " + l1[1]) + ":" + r1); - sign.setLine(2, (m2 ? "$" + q2 : q2 + " " + l2[1]) + ":" + r2); - - user.sendMessage("§7Trade completed."); - } - } - catch (Throwable ex) - { - user.sendMessage("§cError: " + ex.getMessage()); - } - return; - } - } - - @Override - public void onPlayerInteract(PlayerInteractEvent event) - { - if (event.isCancelled()) return; - User user = User.get(event.getPlayer()); - if (user.isJailed()) - { - event.setCancelled(true); - return; - } - - onPlayerInteractEco(event); - onPlayerInteractSigns(event); - - if (!Essentials.getSettings().areSignsDisabled() && EssentialsBlockListener.protectedBlocks.contains(event.getClickedBlock().getType())) - { - if (!user.isAuthorized("essentials.signs.protection.override")) - { - if (EssentialsBlockListener.isBlockProtected(event.getClickedBlock(), user)) - { - event.setCancelled(true); - user.sendMessage("§cYou do not have permission to access that chest."); - return; - } - } - } - - if (Essentials.getSettings().getBedSetsHome() && event.getClickedBlock().getType() == Material.BED_BLOCK) - { - try - { - user.setHome(); - user.sendMessage("§7Your home is now set to this bed."); - } - catch (Throwable ex) - { - } - } - } - - private void onPlayerInteractSigns(PlayerInteractEvent event) - { - User user = User.get(event.getPlayer()); - if (user.isJailed()) return; - if (Essentials.getSettings().areSignsDisabled()) return; - if (event.getClickedBlock().getType() != Material.WALL_SIGN && event.getClickedBlock().getType() != Material.SIGN_POST) - return; - Sign sign = new CraftSign(event.getClickedBlock()); - - try - { - if (sign.getLine(0).equals("§1[Free]") && user.isAuthorized("essentials.signs.free.use")) - { - ItemStack item = ItemDb.get(sign.getLine(1)); - CraftInventoryPlayer inv = new CraftInventoryPlayer(new InventoryPlayer(user.getHandle())); - inv.clear(); - item.setAmount(9 * 4 * 64); - inv.addItem(item); - user.showInventory(inv); - return; - } - if (sign.getLine(0).equals("§1[Disposal]") && user.isAuthorized("essentials.signs.disposal.use")) - { - CraftInventoryPlayer inv = new CraftInventoryPlayer(new InventoryPlayer(user.getHandle())); - inv.clear(); - user.showInventory(inv); - return; - } - if (sign.getLine(0).equals("§1[Heal]") && user.isAuthorized("essentials.signs.heal.use")) - { - user.setHealth(20); - user.sendMessage("§7You have been healed."); - return; - } - if (sign.getLine(0).equals("§1[Mail]") && user.isAuthorized("essentials.signs.mail.use") && user.isAuthorized("essentials.mail")) - { - List<String> mail = Essentials.readMail(user); - if (mail.isEmpty()) - { - user.sendMessage("§cYou do not have any mail!"); - return; - } - for (String s : mail) user.sendMessage(s); - user.sendMessage("§cTo mark your mail as read, type §c/mail clear"); - return; - } - } - catch (Throwable ex) - { - user.sendMessage("§cError: " + ex.getMessage()); - } + essBlockListener = new EssentialsBlockListener(parent); } @Override @@ -342,11 +128,12 @@ public class EssentialsPlayerListener extends PlayerListener } @Override - public void onPlayerQuit(PlayerQuitEvent event) + public void onPlayerQuit(PlayerEvent event) { if (!Essentials.getSettings().getReclaimSetting()) + { return; - + } User.get(event.getPlayer()).dispose(); Thread thread = new Thread(new Runnable() { @@ -375,7 +162,7 @@ public class EssentialsPlayerListener extends PlayerListener } @Override - public void onPlayerJoin(PlayerJoinEvent event) + public void onPlayerJoin(PlayerEvent event) { Essentials.getStatic().backup.onPlayerJoin(); User user = User.get(event.getPlayer()); @@ -441,7 +228,7 @@ public class EssentialsPlayerListener extends PlayerListener } @Override - public void onPlayerTeleport(PlayerTeleportEvent event) + public void onPlayerTeleport(PlayerMoveEvent event) { User user = User.get(event.getPlayer()); if (user.currentJail == null || user.currentJail.isEmpty()) @@ -449,4 +236,87 @@ public class EssentialsPlayerListener extends PlayerListener event.setCancelled(true); user.sendMessage(ChatColor.RED + "You do the crime, you do the time."); } + + @Override + public void onPlayerInteract(PlayerInteractEvent event) + { + + if (event.isCancelled()) return; + if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return; + User user = User.get(event.getPlayer()); + if (user.isJailed()) return; + if (!Essentials.getSettings().areSignsDisabled() && EssentialsBlockListener.protectedBlocks.contains(event.getClickedBlock().getType())) + { + if (!user.isAuthorized("essentials.signs.protection.override")) + { + if (essBlockListener.isBlockProtected(event.getClickedBlock(), user)) + { + event.setCancelled(true); + user.sendMessage("§cYou do not have permission to access that chest."); + return; + } + } + } + + if (Essentials.getSettings().getBedSetsHome() && event.getClickedBlock().getType() == Material.BED_BLOCK) + { + try + { + user.setHome(); + user.sendMessage("§7Your home is now set to this bed."); + } + catch (Throwable ex) + { + } + } + + + if (Essentials.getSettings().areSignsDisabled()) return; + if (event.getClickedBlock().getType() != Material.WALL_SIGN && event.getClickedBlock().getType() != Material.SIGN_POST) + return; + Sign sign = new CraftSign(event.getClickedBlock()); + + try + { + if (sign.getLine(0).equals("§1[Free]") && user.isAuthorized("essentials.signs.free.use")) + { + ItemStack item = ItemDb.get(sign.getLine(1)); + CraftInventoryPlayer inv = new CraftInventoryPlayer(new InventoryPlayer(user.getHandle())); + inv.clear(); + item.setAmount(9 * 4 * 64); + inv.addItem(item); + user.showInventory(inv); + return; + } + if (sign.getLine(0).equals("§1[Disposal]") && user.isAuthorized("essentials.signs.disposal.use")) + { + CraftInventoryPlayer inv = new CraftInventoryPlayer(new InventoryPlayer(user.getHandle())); + inv.clear(); + user.showInventory(inv); + return; + } + if (sign.getLine(0).equals("§1[Heal]") && user.isAuthorized("essentials.signs.heal.use")) + { + user.setHealth(20); + user.sendMessage("§7You have been healed."); + return; + } + if (sign.getLine(0).equals("§1[Mail]") && user.isAuthorized("essentials.signs.mail.use") && user.isAuthorized("essentials.mail")) + { + List<String> mail = Essentials.readMail(user); + if (mail.isEmpty()) + { + user.sendMessage("§cYou do not have any mail!"); + return; + } + for (String s : mail) user.sendMessage(s); + user.sendMessage("§cTo mark your mail as read, type §c/mail clear"); + return; + } + } + catch (Throwable ex) + { + user.sendMessage("§cError: " + ex.getMessage()); + } + } } diff --git a/Essentials/src/com/earth2me/essentials/Jail.java b/Essentials/src/com/earth2me/essentials/Jail.java index 5e0dd87ee..0b88cd5cf 100644 --- a/Essentials/src/com/earth2me/essentials/Jail.java +++ b/Essentials/src/com/earth2me/essentials/Jail.java @@ -7,25 +7,24 @@ import java.util.Map; import java.util.logging.Logger; import org.bukkit.Location; import org.bukkit.World; +import org.bukkit.entity.Player; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockDamageEvent; +import org.bukkit.event.block.BlockInteractEvent; import org.bukkit.event.block.BlockListener; import org.bukkit.event.block.BlockPlaceEvent; +import org.bukkit.event.player.PlayerListener; - -public class Jail extends BlockListener implements IConf -{ +public class Jail extends BlockListener implements IConf { private static final Logger logger = Logger.getLogger("Minecraft"); private EssentialsConf config; - public Jail(File dataFolder) - { + public Jail(File dataFolder) { config = new EssentialsConf(new File(dataFolder, "jail.yml")); config.load(); } - public void setJail(Location loc, String jailName) throws Exception - { + public void setJail(Location loc, String jailName) throws Exception { Map<String, Object> map = new HashMap<String, Object>(); map.put("world", loc.getWorld().getName()); map.put("x", loc.getX()); @@ -37,10 +36,8 @@ public class Jail extends BlockListener implements IConf config.save(); } - public Location getJail(String jailName) throws Exception - { - if (config.getProperty(jailName.toLowerCase()) == null) - { + public Location getJail(String jailName) throws Exception { + if (config.getProperty(jailName.toLowerCase()) == null) { throw new Exception("That jail does not exist"); } @@ -49,12 +46,10 @@ public class Jail extends BlockListener implements IConf double x = config.getDouble(jailName + ".x", 0); // wh.spawnX double y = config.getDouble(jailName + ".y", 0); // wh.spawnY double z = config.getDouble(jailName + ".z", 0); // wh.spawnZ - float yaw = (float)config.getDouble(jailName + ".yaw", 0); - float pitch = (float)config.getDouble(jailName + ".pitch", 0); - for (World w : Essentials.getStatic().getServer().getWorlds()) - { - if (w.getName().equalsIgnoreCase(world)) - { + float yaw = (float) config.getDouble(jailName + ".yaw", 0); + float pitch = (float) config.getDouble(jailName + ".pitch", 0); + for (World w : Essentials.getStatic().getServer().getWorlds()) { + if (w.getName().equalsIgnoreCase(world)) { jWorld = w; break; } @@ -63,34 +58,29 @@ public class Jail extends BlockListener implements IConf return new Location(jWorld, x, y, z, yaw, pitch); } - public void sendToJail(User user, String jail) throws Exception - { - user.teleport(getJail(jail)); + public void sendToJail(User user, String jail) throws Exception { + user.teleportTo(getJail(jail)); user.currentJail = jail; } - public void delJail(String jail) throws Exception - { + public void delJail(String jail) throws Exception { config.removeProperty(jail.toLowerCase()); config.save(); } - public List<String> getJails() throws Exception - { + public List<String> getJails() throws Exception { return config.getKeys(null); } - public void reloadConfig() - { + public void reloadConfig() { config.load(); } - + @Override public void onBlockBreak(BlockBreakEvent event) { User user = User.get(event.getPlayer()); - if (user.isJailed()) - { + if (user.isJailed()) { event.setCancelled(true); } } @@ -99,19 +89,18 @@ public class Jail extends BlockListener implements IConf public void onBlockPlace(BlockPlaceEvent event) { User user = User.get(event.getPlayer()); - if (user.isJailed()) - { + if (user.isJailed()) { event.setCancelled(true); } } @Override - public void onBlockDamage(BlockDamageEvent event) - { + public void onBlockDamage(BlockDamageEvent event) { User user = User.get(event.getPlayer()); - if (user.isJailed()) - { + if (user.isJailed()) { event.setCancelled(true); } } } + + diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java index 5fffdfa99..f1bac2ae4 100644 --- a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java +++ b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java @@ -283,69 +283,4 @@ public class OfflinePlayer implements Player public void sendRawMessage(String string) { throw new UnsupportedOperationException("Not supported yet."); } - - public Location getCompassTarget() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - public int getMaximumNoDamageTicks() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - public void setMaximumNoDamageTicks(int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - public int getLastDamage() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - public void setLastDamage(int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - public int getNoDamageTicks() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - public void setNoDamageTicks(int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - public boolean teleport(Location lctn) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - public boolean teleport(Entity entity) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - public Entity getPassenger() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - public boolean setPassenger(Entity entity) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - public boolean isEmpty() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - public boolean eject() - { - throw new UnsupportedOperationException("Not supported yet."); - } } diff --git a/Essentials/src/com/earth2me/essentials/PlayerWrapper.java b/Essentials/src/com/earth2me/essentials/PlayerWrapper.java index 0de6f669e..cf3a6db58 100644 --- a/Essentials/src/com/earth2me/essentials/PlayerWrapper.java +++ b/Essentials/src/com/earth2me/essentials/PlayerWrapper.java @@ -154,15 +154,15 @@ public class PlayerWrapper implements Player } @Override - public boolean teleport(Location lctn) + public void teleportTo(Location lctn) { - return base.teleport(lctn); + base.teleportTo(lctn); } @Override - public boolean teleport(Entity entity) + public void teleportTo(Entity entity) { - return base.teleport(entity); + base.teleportTo(entity); } @Override @@ -329,88 +329,7 @@ public class PlayerWrapper implements Player return base.getEyeLocation(); } - @Override public void sendRawMessage(String string) { base.sendRawMessage(string); } - - @Override - public Location getCompassTarget() - { - return base.getCompassTarget(); - } - - @Override - public int getMaximumNoDamageTicks() - { - return base.getMaximumNoDamageTicks(); - } - - @Override - public void setMaximumNoDamageTicks(int i) - { - base.setMaximumNoDamageTicks(i); - } - - @Override - public int getLastDamage() - { - return base.getLastDamage(); - } - - @Override - public void setLastDamage(int i) - { - base.setLastDamage(i); - } - - @Override - public int getNoDamageTicks() - { - return base.getNoDamageTicks(); - } - - @Override - public void setNoDamageTicks(int i) - { - base.setNoDamageTicks(i); - } - - @Override - public Entity getPassenger() - { - return base.getPassenger(); - } - - @Override - public boolean setPassenger(Entity entity) - { - return base.setPassenger(entity); - } - - @Override - public boolean isEmpty() - { - return base.isEmpty(); - } - - @Override - public boolean eject() - { - return base.eject(); - } - - @Override - @Deprecated - public void teleportTo(Location lctn) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - @Deprecated - public void teleportTo(Entity entity) - { - throw new UnsupportedOperationException("Not supported yet."); - } } diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index 472015997..0853975ca 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -91,7 +91,7 @@ public class User extends PlayerExtension implements Comparable<User> public void respawn(Spawn spawn, final String chargeFor) throws Exception { - teleport(getSafeDestination(spawn.getSpawn(getGroup())), chargeFor); + teleportTo(getSafeDestination(spawn.getSpawn(getGroup())), chargeFor); } private User update(Player base) @@ -383,7 +383,7 @@ public class User extends PlayerExtension implements Comparable<User> cancelTeleport(false); } - public boolean teleport(final Location loc, final String chargeFor) + public void teleportTo(final Location loc, final String chargeFor) { final long delay = Essentials.getSettings().getTeleportDelay(); @@ -393,13 +393,13 @@ public class User extends PlayerExtension implements Comparable<User> { if (chargeFor != null) charge(chargeFor); teleportCooldown(false); - return teleportToNow(loc); + teleportToNow(loc); } catch (Throwable ex) { sendMessage("§cError: " + ex.getMessage()); - return false; } + return; } cancelTeleport(); @@ -424,16 +424,15 @@ public class User extends PlayerExtension implements Comparable<User> cancelTeleport(); } }, 10, 10); - return true; } @Override - public boolean teleport(final Location loc) + public void teleportTo(final Location loc) { - return teleport(loc, null); + teleportTo(loc, null); } - public boolean teleport(final Entity entity, final String chargeFor) + public void teleportTo(final Entity entity, final String chargeFor) { final long delay = Essentials.getSettings().getTeleportDelay(); @@ -443,13 +442,13 @@ public class User extends PlayerExtension implements Comparable<User> { if (chargeFor != null) charge(chargeFor); teleportCooldown(false); - return teleportToNow(entity); + teleportToNow(entity); } catch (Throwable ex) { sendMessage("§cError: " + ex.getMessage()); - return false; } + return; } cancelTeleport(); @@ -474,13 +473,12 @@ public class User extends PlayerExtension implements Comparable<User> cancelTeleport(); } }, 10, 10); - return true; } @Override - public boolean teleport(final Entity entity) + public void teleportTo(final Entity entity) { - return teleport(entity, null); + teleportTo(entity, null); } public Location getHome() throws Exception @@ -581,23 +579,23 @@ public class User extends PlayerExtension implements Comparable<User> teleportToHome(null); } - public boolean teleportToNow(Location loc) throws Exception + public void teleportToNow(Location loc) throws Exception { cancelTeleport(); lastLocation = getLocation(); - return getBase().teleport(getSafeDestination(loc)); + getBase().teleportTo(getSafeDestination(loc)); } - public boolean teleportToNow(Entity entity) + public void teleportToNow(Entity entity) { cancelTeleport(); lastLocation = getLocation(); - return getBase().teleport(entity); + getBase().teleportTo(entity); } public void teleportBack(final String chargeFor) { - teleport(lastLocation, chargeFor); + teleportTo(lastLocation, chargeFor); } public void teleportBack() @@ -669,7 +667,7 @@ public class User extends PlayerExtension implements Comparable<User> { lastLocation = getLocation(); Location loc = Essentials.getWarps().getWarp(warp); - teleport(loc, chargeFor); + teleportTo(loc, chargeFor); sendMessage("§7Warping to " + warp + "."); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java b/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java index 2069e61b9..6aa7ef18f 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java @@ -3,6 +3,7 @@ package com.earth2me.essentials.commands; import org.bukkit.Server; import com.earth2me.essentials.Essentials; import com.earth2me.essentials.User; +import org.bukkit.command.CommandSender; public class Commandbroadcast extends EssentialsCommand @@ -13,11 +14,11 @@ public class Commandbroadcast extends EssentialsCommand } @Override - public void run(Server server, Essentials parent, User user, String commandLabel, String[] args) throws Exception + public void run(Server server, Essentials parent, CommandSender sender, String commandLabel, String[] args) throws Exception { if (args.length < 1) { - user.sendMessage("Usage: /" + commandLabel + " [msg]"); + sender.sendMessage("Usage: /" + commandLabel + " [msg]"); } StringBuilder message = new StringBuilder(); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandjump.java b/Essentials/src/com/earth2me/essentials/commands/Commandjump.java index b753fc4b3..b26ffd82a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandjump.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandjump.java @@ -45,6 +45,6 @@ public class Commandjump extends EssentialsCommand } user.canAfford(this); - user.teleport(loc, this.getName()); + user.teleportTo(loc, this.getName()); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandme.java b/Essentials/src/com/earth2me/essentials/commands/Commandme.java index 6b3deaf1d..cd0a6b013 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandme.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandme.java @@ -21,11 +21,6 @@ public class Commandme extends EssentialsCommand @Override public void run(Server server, Essentials parent, User user, String commandLabel, String[] args) throws Exception { - if (user.isMuted()) - { user.sendMessage("§7Your voice has been silenced"); - return; - } - if (args.length < 1) { user.sendMessage("§cUsage: /me [description]"); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtop.java b/Essentials/src/com/earth2me/essentials/commands/Commandtop.java index a928701a2..7776e7bcb 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtop.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtop.java @@ -20,7 +20,7 @@ public class Commandtop extends EssentialsCommand int topZ = user.getLocation().getBlockZ(); int topY = user.getWorld().getHighestBlockYAt(topX, topZ); user.charge(this); - user.teleport(new Location(user.getWorld(), user.getLocation().getX(), topY + 1, user.getLocation().getZ()), this.getName()); + user.teleportTo(new Location(user.getWorld(), user.getLocation().getX(), topY + 1, user.getLocation().getZ()), this.getName()); user.sendMessage("§7Teleporting to top."); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtp.java b/Essentials/src/com/earth2me/essentials/commands/Commandtp.java index a36a7e415..82f8e8bd2 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtp.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtp.java @@ -28,7 +28,7 @@ public class Commandtp extends EssentialsCommand if (!p.isTeleEnabled()) throw new Exception(p.getDisplayName() + " has teleportation disabled."); user.sendMessage("§7Teleporting..."); user.canAfford(this); - user.teleport(p, this.getName()); + user.teleportTo(p, this.getName()); break; case 2: diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java index 84acdf82c..03907fead 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java @@ -27,14 +27,14 @@ public class Commandtpaccept extends EssentialsCommand user.canAfford(this); user.sendMessage("§7Teleport request accepted."); p.sendMessage("§7Teleport request accepted."); - user.teleport(p, this.getName()); + user.teleportTo(p, this.getName()); } else { user.canAfford(this); user.sendMessage("§7Teleport request accepted."); p.sendMessage("§7Teleport request accepted."); - p.teleport(user, this.getName()); + p.teleportTo(user, this.getName()); } } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java b/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java index 031735e9a..f352da37d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java @@ -37,6 +37,6 @@ public class Commandtppos extends EssentialsCommand user.canAfford(this); user.teleportCooldown(); user.sendMessage("§7Teleporting..."); - user.teleport(user.getSafeDestination(l), this.getName()); + user.teleportTo(user.getSafeDestination(l), this.getName()); } }
\ No newline at end of file diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java index 508e69a58..17a2c57b1 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java @@ -34,9 +34,9 @@ public class Commandwhois extends EssentialsCommand sender.sendMessage(""); sender.sendMessage(u.getDisplayName() + " is " + u.getName()); sender.sendMessage(ChatColor.BLUE + " - Health: " + u.getHealth() + "/20"); - sender.sendMessage(ChatColor.BLUE + " - Location: (" + u.getLocation().getBlockX() + ", " + u.getLocation().getBlockY() + ", " + u.getLocation().getBlockZ() + ")"); + sender.sendMessage(ChatColor.BLUE + " - Location: (" + u.getLocation().getWorld().getName() + ", " + u.getLocation().getBlockX() + ", " + u.getLocation().getBlockY() + ", " + u.getLocation().getBlockZ() + ")"); if (!parent.getConfiguration().getBoolean("disable-eco", false)) sender.sendMessage(ChatColor.BLUE + " - Money: $" + u.getMoney()); - sender.sendMessage(ChatColor.BLUE + " - Status: " + (parent.away.contains(u) ? "§cAway" : "Available")); + sender.sendMessage(ChatColor.BLUE + " - Status: " + (parent.away.contains(u) ? "§cAway§f" : "Available")); sender.sendMessage(ChatColor.BLUE + " - IP Address: " + u.getAddress().getAddress().toString()); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java b/Essentials/src/com/earth2me/essentials/commands/Commandworld.java index 8f3ad45e7..41a2d270d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandworld.java @@ -62,6 +62,6 @@ public class Commandworld extends EssentialsCommand user.canAfford(this); user.teleportCooldown(); - user.teleport(loc, this.getName()); + user.teleportTo(loc, this.getName()); } } diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml index 7da7426f6..f2a41666d 100644 --- a/Essentials/src/config.yml +++ b/Essentials/src/config.yml @@ -181,6 +181,7 @@ bed-sethome: false starting-balance: 0 # worth-# defines the value of an item when it is sold to the server via /sell. +# For a premade list which you may copy and paste in: http://pastie.org/1707782 #worth-1: 1 #worth-278: 1000 @@ -234,14 +235,14 @@ mcsl-key: '' chat: radius: 0 - # If you want the default chat format, uncomment the next line and comment the other format. - #format: '<{DISPLAYNAME}> {MESSAGE}' - format: '&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}' + # If set to the default chat format which "should" be compatible with ichat. + format: '<{DISPLAYNAME}> {MESSAGE}' + #format: '&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}' - # You can also have group-specific formats: + # You can also have group-specific formats, uncomment to enable: group-formats: - Default: '{WORLDNAME} {DISPLAYNAME}&7:&f {MESSAGE}' - Admins: '{WORLDNAME} &c[{GROUP}]&f {DISPLAYNAME}&7:&c {MESSAGE}' + # Default: '{WORLDNAME} {DISPLAYNAME}&7:&f {MESSAGE}' + # Admins: '{WORLDNAME} &c[{GROUP}]&f {DISPLAYNAME}&7:&c {MESSAGE}' @@ -268,7 +269,7 @@ protect: mysqlDb: 'jdbc:mysql://localhost:3306/minecraft' # For which block types would you like to be alerted? - # You can find a list of IDs in plugins/Essentials/Items.csv after loading Essentials for the first time. + # You can find a list of IDs in plugins/Essentials/items.csv after loading Essentials for the first time. alert: # 10: lava # 11: still lava @@ -347,7 +348,7 @@ protect: # Should damage via lava be disabled? Items that fall into lava will still burn to a crisp. ;) lavadmg: false - # Should arrow damage be disabled + # Should arrows cause damage? projectiles: false # This will disable damage from touching cacti. @@ -382,4 +383,4 @@ newbies: # When we spawn for the first time, which spawnpoint do we use? spawnpoint: newbies -# End of File <-- No seriously, you're done with configuration.
\ No newline at end of file +# End of File <-- No seriously, you're done with configuration. diff --git a/Essentials/src/items.csv b/Essentials/src/items.csv index 3bf204167..a67ba6fa1 100644 --- a/Essentials/src/items.csv +++ b/Essentials/src/items.csv @@ -28,14 +28,62 @@ ironore,15,0 iore,15,0
coalore,16,0
core,16,0
+tree,17,0
log,17,0
trunk,17,0
wood,17,0
-redwood,5,1
-rwood,5,1
-birchwood,5,2
-birch,5,2
-bwood,5,2
+redtree,17,1
+redlog,17,1
+redtrunk,17,1
+redwood,17,1
+darktree,17,1
+darklog,17,1
+darktrunk,17,1
+darkwood,17,1
+blacktree,17,1
+blacklog,17,1
+blacktrunk,17,1
+blackwood,17,1
+rtree,17,1
+rlog,17,1
+rtrunk,17,1
+rwood,17,1
+dtree,17,1
+dlog,17,1
+dtrunk,17,1
+dwood,17,1
+bltree,17,1
+bllog,17,1
+bltrunk,17,1
+blwood,17,1
+birchtree,17,2
+birchlog,17,2
+birchtrunk,17,2
+birchwood,17,2
+pandatree,17,2
+pandalog,17,2
+pandatrunk,17,2
+pandawood,17,2
+whitetree,17,2
+whitelog,17,2
+whitetrunk,17,2
+whitewood,17,2
+bitree,17,2
+bilog,17,2
+bitrunk,17,2
+biwood,17,2
+btree,17,2
+blog,17,2
+btrunk,17,2
+bwood,17,2
+ptree,17,2
+plog,17,2
+ptrunk,17,2
+pwood,17,2
+wtree,17,2
+wlog,17,2
+wtrunk,17,2
+wwood,17,2
leaves,18,0
sponge,19,0
glass,20,0
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListener.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListener.java index e351cc865..890187ee3 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListener.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListener.java @@ -2,7 +2,10 @@ package com.earth2me.essentials.chat; import com.earth2me.essentials.Essentials; import org.bukkit.Server; -import org.bukkit.event.player.*; +import org.bukkit.event.player.PlayerChatEvent; +import org.bukkit.event.player.PlayerEvent; +import org.bukkit.event.player.PlayerListener; +import org.bukkit.event.player.PlayerRespawnEvent; public class EssentialsChatPlayerListener extends PlayerListener @@ -16,7 +19,7 @@ public class EssentialsChatPlayerListener extends PlayerListener @Override @SuppressWarnings("CallToThreadDumpStack") - public void onPlayerJoin(PlayerJoinEvent event) + public void onPlayerJoin(PlayerEvent event) { try { diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatWorker.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatWorker.java index e11504259..09a27f18f 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatWorker.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatWorker.java @@ -52,20 +52,15 @@ public class EssentialsChatWorker public static void onPlayerChat(Server server, PlayerChatEvent event) { + if (event.isCancelled()) return; User user = User.get(event.getPlayer()); updateDisplayName(user); if (user.isAuthorized("essentials.chat.color")) event.setMessage(event.getMessage().replaceAll("&([0-9a-f])", "§$1")); - - event.setFormat(Essentials.getSettings().getChatFormat(user.getGroup()) - .replace('&', '§') - .replace("§§", "&") - .replace("{DISPLAYNAME}", "%1$s") - .replace("{GROUP}", user.getGroup()) - .replace("{MESSAGE}", "%2$s") - .replace("{WORLDNAME}", user.getWorld().getName())); - + + event.setFormat(Essentials.getSettings().getChatFormat(user.getGroup()).replace('&', '§').replace("§§", "&").replace("{DISPLAYNAME}", "%1$s").replace("{GROUP}", user.getGroup()).replace("{MESSAGE}", "%2$s").replace("{WORLDNAME}", user.getWorld().getName())); + int radius = Essentials.getSettings().getChatRadius(); if (radius < 1) return; @@ -81,7 +76,7 @@ public class EssentialsChatWorker event.setCancelled(true); return; } - + if (event.getMessage().startsWith("?") && event.getMessage().length() > 1) { if (user.isAuthorized("essentials.chat.question")) diff --git a/EssentialsGroupManager/src/groups.yml b/EssentialsGroupManager/src/groups.yml index 73c55b880..487233ce9 100644 --- a/EssentialsGroupManager/src/groups.yml +++ b/EssentialsGroupManager/src/groups.yml @@ -1,172 +1,147 @@ -groups:
- Default:
- default: true
- permissions:
- - essentials.help
- - essentials.home
- - essentials.motd
- - essentials.sethome
- - essentials.spawn
- inheritance: []
- info:
- prefix: ''
- build: false
- suffix: ''
- SemiAdmin:
- default: false
- permissions:
- - +groupmanager.mandemote
- - +groupmanager.manpromote
- - -groupmanager.*
- - '*'
- inheritance:
- - moderator
- info:
- prefix: '&c'
- build: true
- suffix: SemiAdmin
- RedFaction:
- default: false
- permissions: []
- inheritance:
- - peasant
- info:
- prefix: '&c'
- roles-category: faction
- build: true
- suffix: Red
- Farmer:
- default: false
- permissions:
- - essentials.kit
- - essentials.kit.farmer
- - essentials.spawnmob
- inheritance: []
- info:
- roles-requirement:
- - BlueFaction
- - RedFaction
- prefix: ''
- roles-category: job
- build: false
- suffix: ''
- Healer:
- default: false
- permissions:
- - essentials.kit
- - essentials.kit.healer
- - essentials.heal
- inheritance: []
- info:
- roles-requirement:
- - BlueFaction
- - RedFaction
- prefix: ''
- roles-category: job
- build: false
- suffix: ''
- Fighter:
- default: false
- permissions:
- - essentials.kit
- - essentials.kit.fighter
- inheritance: []
- info:
- prefix: ''
- roles-category: skill
- build: false
- suffix: ''
- Admin:
- default: false
- permissions:
- - '*'
- inheritance:
- - semiadmin
- info:
- prefix: ''
- build: true
- suffix: ''
- Miner:
- default: false
- permissions:
- - essentials.kit
- - essentials.kit.miner
- - flashlight.regular
- inheritance: []
- info:
- roles-requirement:
- - BlueFaction
- - RedFaction
- prefix: ''
- roles-category: job
- build: false
- suffix: ''
- FlyingMan:
- default: false
- permissions:
- - nocheat.moving
- inheritance: []
- info:
- roles-requirement: Fighter&SuperCart
- prefix: ''
- roles-category: skill
- build: false
- suffix: ''
- Peasant:
- default: false
- permissions:
- - roles.joinrole
- - roles.leaverole
- - roles.myroles
- inheritance:
- - default
- info:
- prefix: '&e'
- build: true
- suffix: Peasant
- BlueFaction:
- default: false
- permissions: []
- inheritance:
- - peasant
- info:
- prefix: '&d'
- roles-category: faction
- build: true
- suffix: Blue
- Railer:
- default: false
- permissions:
- - essentials.kit
- - essentials.kit.railer
- inheritance: []
- info:
- roles-requirement: Miner
- prefix: ''
- roles-category: subjob
- build: false
- suffix: ''
- SuperCart:
- default: false
- permissions:
- - minecartmania.*
- inheritance: []
- info:
- roles-requirement: Railer
- prefix: ''
- roles-category: skill
- build: false
- suffix: ''
- Moderator:
- default: false
- permissions:
- - essentials.tp
- - essentials.tphere
- - essentials.item
- - essentials.give
- inheritance:
- - default
- info:
- prefix: '&c'
- build: true
- suffix: Mod
\ No newline at end of file +groups: + Default: + default: true + permissions: + - essentials.help + - essentials.helpop + - essentials.list + - essentials.motd + - essentials.rules + - essentials.spawn + inheritance: [] + info: + prefix: '&e' + build: false + suffix: '' + SemiAdmin: + default: false + permissions: + - -groupmanager.mantogglesave + - essentials + - essentials.clearinventory + - essentials.cooldown.bypass + - essentials.deljail + - essentials.give + - essentials.god + - essentials.heal + - essentials.heal.others + - essentials.invsee + - essentials.item + - essentials.jails + - essentials.kickall + - essentials.kit.* + - essentials.mute + - essentials.sell + - essentials.setjail + - essentials.signs.protection.override + - essentials.spawmob + - essentials.teleport.cooldown.bypass + - essentials.teleport.timer.bypass + - essentials.togglejail + - groupmanager.* + - essentials.burn + inheritance: + - moderator + info: + prefix: '&c' + build: true + suffix: '' + Builder: + default: false + permissions: + - essentials.afk + - essentials.back.ondeath + - essentials.balance + - essentials.chat.shout + - essentials.compass + - essentials.home + - essentials.kit + - essentials.kit.tools + - essentials.mail + - essentials.mail.send + - essentials.me + - essentials.msg + - essentials.nick + - essentials.pay + - essentials.portal + - essentials.protect + - essentials.sethome + - essentials.signs.buy.use + - essentials.signs.disposal.create + - essentials.signs.disposal.use + - essentials.signs.free.use + - essentials.signs.heal.use + - essentials.signs.mail.create + - essentials.signs.mail.use + - essentials.signs.protection.create + - essentials.signs.protection.use + - essentials.signs.sell.use + - essentials.signs.trade.create + - essentials.signs.trade.use + - essentials.suicide + - essentials.tpa + - essentials.tpaccept + - essentials.tpahere + - essentials.tpdeny + - essentials.warp + - essentials.warp.list + - essentials.worth + inheritance: + - default + info: + prefix: '&2' + build: true + suffix: '' + Moderator: + default: false + permissions: + - essentials.back + - essentials.ban + - essentials.banip + - essentials.broadcast + - essentials.delwarp + - essentials.depth + - essentials.eco + - essentials.getpos + - essentials.jump + - essentials.kick + - essentials.kill + - essentials.setwarp + - essentials.time + - essentials.togglejail + - essentials.top + - essentials.tp + - essentials.tphere + - essentials.tpo + - essentials.tpohere + - essentials.tppos + - essentials.tptoggle + - essentials.unban + - essentials.unbanip + - essentials.whois + - essentials.world + - groupmanager.listgroups + - groupmanager.mandemote + - groupmanager.manload + - groupmanager.manpromote + - groupmanager.mansave + - groupmanager.manselect + - groupmanager.manuadd + - groupmanager.manudel + - essentials.ext + inheritance: + - builder + info: + prefix: '&5' + build: true + suffix: '' + Admin: + default: false + permissions: + - '*' + inheritance: + - semiadmin + info: + prefix: '&4' + build: true + suffix: '' diff --git a/EssentialsGroupManager/src/users.yml b/EssentialsGroupManager/src/users.yml index 5645c5d23..c3324f0c0 100644 --- a/EssentialsGroupManager/src/users.yml +++ b/EssentialsGroupManager/src/users.yml @@ -1,59 +1,15 @@ -users:
- aMiner:
- subgroups:
- - Miner
- permissions: []
- group: BlueFaction
- info:
- prefix: '&d'
- suffix: Miner
- gmcouto:
- subgroups: []
- permissions: []
- group: SemiAdmin
- tempRailer:
- subgroups:
- - Miner
- - Railer
- permissions: []
- group: BlueFaction
- info:
- prefix: '&d'
- suffix: Miner
- anjocaido:
- subgroups: []
- permissions: []
- group: Admin
- info:
- prefix: '&c'
- suffix: King
- aFarmer:
- subgroups:
- - Farmer
- permissions: []
- group: RedFaction
- info:
- prefix: '&d'
- suffix: Farmer
- zenexer:
- subgroups: []
- permissions:
- - essentials.god
- group: Moderator
- Teste:
- subgroups:
- - Miner
- - Railer
- - SuperCart
- - Fighter
- - FlyingMan
- permissions: []
- group: BlueFaction
- aHealer:
- subgroups:
- - Healer
- permissions: []
- group: RedFaction
- info:
- prefix: '&d'
- suffix: Healer
+# "For a more advanced configuration example utilizing the advanced features of GroupManager, see http://pastebin.com/a8ZA0j5G" +users: + kimkandor: + subgroups: [] + permissions: [] + group: Admin + mudzereli: + subgroups: [] + permissions: [] + group: Builder + zenexer: + subgroups: [] + permissions: [] + group: Admin + diff --git a/EssentialsProtect/build.xml b/EssentialsProtect/build.xml index 3e57911b3..e5e614e3e 100644 --- a/EssentialsProtect/build.xml +++ b/EssentialsProtect/build.xml @@ -78,7 +78,6 @@ <zipfileset src="${dist.jar}" excludes="META-INF/*" />
<zipfileset src="../lib/mysql.jar" excludes="META-INF/*" />
<zipfileset src="../lib/sqlite.jar" excludes="META-INF/*" />
- <zipfileset src="../lib/c3p0-0.9.1.2.jar" excludes="META-INF/*" />
<manifest>
<attribute name="Classpath" value="Essentials.jar"/>
</manifest>
diff --git a/EssentialsProtect/nbproject/project.properties b/EssentialsProtect/nbproject/project.properties index 3f2895ed5..dcce6d152 100644 --- a/EssentialsProtect/nbproject/project.properties +++ b/EssentialsProtect/nbproject/project.properties @@ -26,7 +26,6 @@ dist.jar=${dist.dir}/original-EssentialsProtect.jar dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
-file.reference.c3p0-0.9.1.2.jar=..\\lib\\c3p0-0.9.1.2.jar
file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
file.reference.mysql.jar=..\\lib\\mysql.jar
file.reference.sqlite.jar=..\\lib\\sqlite.jar
@@ -38,8 +37,7 @@ javac.classpath=\ ${reference.Essentials.jar}:\
${file.reference.mysql.jar}:\
${file.reference.sqlite.jar}:\
- ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\
- ${file.reference.c3p0-0.9.1.2.jar}
+ ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java index d6869519b..798153b1c 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java @@ -1,13 +1,7 @@ package com.earth2me.essentials.protect; import com.earth2me.essentials.Essentials; -import com.earth2me.essentials.IConf; import com.earth2me.essentials.User; -import com.earth2me.essentials.protect.data.IProtectedBlock; -import com.earth2me.essentials.protect.data.ProtectedBlockMemory; -import com.earth2me.essentials.protect.data.ProtectedBlockMySQL; -import com.earth2me.essentials.protect.data.ProtectedBlockSQLite; -import java.beans.PropertyVetoException; import java.util.ArrayList; import java.util.HashMap; import java.util.logging.Level; @@ -21,7 +15,7 @@ import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; -public class EssentialsProtect extends JavaPlugin implements IConf +public class EssentialsProtect extends JavaPlugin { private EssentialsProtectBlockListener blockListener = null; private EssentialsProtectPlayerListener playerListener = null; @@ -39,8 +33,6 @@ public class EssentialsProtect extends JavaPlugin implements IConf public static ArrayList onUseAlert = null; public static ArrayList onBreakAlert = null; - private IProtectedBlock storage = null; - private static EssentialsProtect instance = null; public EssentialsProtect() { @@ -50,18 +42,15 @@ public class EssentialsProtect extends JavaPlugin implements IConf { PluginManager pm = this.getServer().getPluginManager(); Essentials ess = (Essentials)pm.getPlugin("Essentials"); - if (!ess.isEnabled()) { + if (!ess.isEnabled()) pm.enablePlugin(ess); - } - - instance = this; - reloadConfig(); playerListener = new EssentialsProtectPlayerListener(this); blockListener = new EssentialsProtectBlockListener(this); entityListener = new EssentialsProtectEntityListener(this); - pm.registerEvent(Type.PLAYER_PICKUP_ITEM, playerListener, Priority.Low, this); pm.registerEvent(Type.PLAYER_INTERACT, playerListener, Priority.Low, this); + // Why is this commented? + //pm.registerEvent(Type.BLOCK_DAMAGED, blockListener, Priority.High, this); pm.registerEvent(Type.BLOCK_PLACE, blockListener, Priority.Highest, this); pm.registerEvent(Type.BLOCK_FROMTO, blockListener, Priority.Highest, this); pm.registerEvent(Type.BLOCK_IGNITE, blockListener, Priority.Highest, this); @@ -71,6 +60,7 @@ public class EssentialsProtect extends JavaPlugin implements IConf pm.registerEvent(Type.BLOCK_BREAK, blockListener, Priority.Highest, this); pm.registerEvent(Type.CREATURE_SPAWN, entityListener, Priority.Highest, this); + loadSettings(); if (!this.getDescription().getVersion().equals(Essentials.getStatic().getDescription().getVersion())) { logger.log(Level.WARNING, "Version mismatch! Please update all Essentials jars to the same version."); } @@ -102,23 +92,8 @@ public class EssentialsProtect extends JavaPlugin implements IConf onBreakAlert = null; } - public void alert(User user, String item, String type) + public static void loadSettings() { - Location loc = user.getLocation(); - for (Player p : this.getServer().getOnlinePlayers()) - { - User alertUser = User.get(p); - if (alertUser.isAuthorized("essentials.protect.alerts")) - alertUser.sendMessage(ChatColor.DARK_AQUA + "[" + user.getName() + "] " + ChatColor.WHITE + type + ChatColor.GOLD + item + " at: " + formatCoords(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); - } - } - - public static String formatCoords(int x, int y, int z) - { - return x + "," + y + "," + z; - } - - public void reloadConfig() { dataSettings = Essentials.getSettings().getEpDBSettings(); genSettings = Essentials.getSettings().getEpSettings(); guardSettings = Essentials.getSettings().getEpGuardSettings(); @@ -129,26 +104,17 @@ public class EssentialsProtect extends JavaPlugin implements IConf onUseAlert = Essentials.getSettings().getEpAlertOnUse(); onBreakAlert = Essentials.getSettings().getEpAlertOnBreak(); playerSettings = Essentials.getSettings().getEpPlayerSettings(); - - if (dataSettings.get("protect.datatype").equals("mysql")) { - try { - storage = new ProtectedBlockMySQL(dataSettings.get("protect.mysqlDb"), dataSettings.get("protect.username"), dataSettings.get("protect.password")); - } catch (PropertyVetoException ex) { - logger.log(Level.SEVERE, null, ex); - } - } else { - try { - storage = new ProtectedBlockSQLite("jdbc:sqlite:plugins/Essentials/EssentialsProtect.db"); - } catch (PropertyVetoException ex) { - logger.log(Level.SEVERE, null, ex); - } - } - if (genSettings.get("protect.memstore")) { - storage = new ProtectedBlockMemory(storage); - } + EssentialsProtectData.createSqlTable(); } - - public static IProtectedBlock getStorage() { - return EssentialsProtect.instance.storage; + + public void alert(User user, String item, String type) + { + Location loc = user.getLocation(); + for (Player p : this.getServer().getOnlinePlayers()) + { + User alertUser = User.get(p); + if (alertUser.isAuthorized("essentials.protect.alerts")) + alertUser.sendMessage(ChatColor.DARK_AQUA + "[" + user.getName() + "] " + ChatColor.WHITE + type + ChatColor.GOLD + item + " at: " + EssentialsProtectData.formatCoords(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + } } } diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java index 2028edf42..e96165ecd 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java @@ -2,24 +2,28 @@ package com.earth2me.essentials.protect; import com.earth2me.essentials.Essentials; import com.earth2me.essentials.User; -import java.util.ArrayList; -import java.util.List; +import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; import org.bukkit.entity.Player; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockBurnEvent; import org.bukkit.event.block.BlockFromToEvent; import org.bukkit.event.block.BlockIgniteEvent; +import org.bukkit.event.block.BlockInteractEvent; import org.bukkit.event.block.BlockListener; import org.bukkit.event.block.BlockPlaceEvent; +import org.bukkit.event.block.BlockRightClickEvent; import org.bukkit.inventory.ItemStack; public class EssentialsProtectBlockListener extends BlockListener { private EssentialsProtect parent; + private int railBlockX; + private int railBlockY; + private int railBlockZ; + private EssentialsProtectData spData; public EssentialsProtectBlockListener(EssentialsProtect parent) { @@ -27,10 +31,17 @@ public class EssentialsProtectBlockListener extends BlockListener this.parent = parent; } + private void initialize() + { + if (spData != null) return; + spData = new EssentialsProtectData(); + } + @Override public void onBlockPlace(BlockPlaceEvent event) { if (event.isCancelled()) return; + initialize(); ItemStack item = event.getItemInHand(); User user = User.get(event.getPlayer()); @@ -40,6 +51,7 @@ public class EssentialsProtectBlockListener extends BlockListener return; } + Block blockPlaced = event.getBlockAgainst(); int id = event.getBlockPlaced().getTypeId(); if (EssentialsProtect.checkProtectionItems(EssentialsProtect.blackListPlace, id) && !user.isAuthorized("essentials.protect.exemptplacement")) @@ -53,48 +65,33 @@ public class EssentialsProtectBlockListener extends BlockListener parent.alert(user, item.getType().toString(), "placed: "); } - Block blockPlaced = event.getBlockPlaced(); - Block below = blockPlaced.getFace(BlockFace.DOWN); - if (below.getType() == Material.RAILS) { + if (spData.isBlockAboveProtectedRail(blockPlaced)) + { if (EssentialsProtect.genSettings.get("protect.protect.prevent.block-on-rail")) { - if (EssentialsProtect.getStorage().isProtected(below, user.getName())) { - event.setCancelled(true); - return; - } + event.setCancelled(true); + return; } } - List<Block> protect = new ArrayList<Block>(); - if (blockPlaced.getType() == Material.RAILS) { + if (item.getTypeId() == 66) + { if (EssentialsProtect.genSettings.get("protect.protect.rails")) { if (user.isAuthorized("essentials.protect")) { - protect.add(blockPlaced); - if (EssentialsProtect.genSettings.get("protect.protect.block-below")) - { - protect.add(blockPlaced.getFace(BlockFace.DOWN)); - } - } - } - } - if (blockPlaced.getType() == Material.SIGN_POST || blockPlaced.getType() == Material.WALL_SIGN) { - if (EssentialsProtect.genSettings.get("protect.protect.signs")) - { - if (user.isAuthorized("essentials.protect")) - { - protect.add(blockPlaced); + railBlockX = blockPlaced.getX(); + railBlockY = blockPlaced.getY(); + railBlockZ = blockPlaced.getZ(); + + spData.insertProtectionIntoDb(user.getWorld().getName(), user.getName(), railBlockX, railBlockY + 1, railBlockZ); if (EssentialsProtect.genSettings.get("protect.protect.block-below")) { - protect.add(event.getBlockAgainst()); + spData.insertProtectionIntoDb(user.getWorld().getName(), user.getName(), railBlockX, railBlockY, railBlockZ); } } } } - for (Block block : protect) { - EssentialsProtect.getStorage().protectBlock(block, user.getName()); - } } @Override @@ -131,7 +128,7 @@ public class EssentialsProtectBlockListener extends BlockListener } @Override - public void onBlockFromTo(BlockFromToEvent event) + public void onBlockFlow(BlockFromToEvent event) { if (event.isCancelled()) return; Block block = event.getBlock(); @@ -190,6 +187,7 @@ public class EssentialsProtectBlockListener extends BlockListener public void onBlockBreak(BlockBreakEvent event) { if (event.isCancelled()) return; + initialize(); User user = User.get(event.getPlayer()); Block block = event.getBlock(); if (EssentialsProtect.playerSettings.get("protect.disable.build") && !user.canBuild()) @@ -213,57 +211,28 @@ public class EssentialsProtectBlockListener extends BlockListener { if (block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST || block.getType() == Material.RAILS) { - EssentialsProtect.getStorage().unprotectBlock(block); - if (block.getType() == Material.RAILS || block.getType() == Material.SIGN_POST) { - Block below = block.getFace(BlockFace.DOWN); - EssentialsProtect.getStorage().unprotectBlock(below); - } else { - BlockFace[] faces = new BlockFace[] { - BlockFace.NORTH, - BlockFace.EAST, - BlockFace.SOUTH, - BlockFace.WEST - }; - for (BlockFace blockFace : faces) { - Block against = block.getFace(blockFace); - EssentialsProtect.getStorage().unprotectBlock(against); - } - } + spData.removeProtectionFromDB(block, true); } else { - EssentialsProtect.getStorage().unprotectBlock(block); + spData.removeProtectionFromDB(block); } return; } else { - - boolean isProtected = EssentialsProtect.getStorage().isProtected(block, user.getName()); - if (!isProtected) { + boolean canDestroy = spData.canDestroy(user.getWorld().getName(), user.getName(), block); + if (canDestroy) + { if (block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST || block.getType() == Material.RAILS) - { - EssentialsProtect.getStorage().unprotectBlock(block); - if (block.getType() == Material.RAILS || block.getType() == Material.SIGN_POST) { - Block below = block.getFace(BlockFace.DOWN); - EssentialsProtect.getStorage().unprotectBlock(below); - } else { - BlockFace[] faces = new BlockFace[] { - BlockFace.NORTH, - BlockFace.EAST, - BlockFace.SOUTH, - BlockFace.WEST - }; - for (BlockFace blockFace : faces) { - Block against = block.getFace(blockFace); - EssentialsProtect.getStorage().unprotectBlock(against); - } - } + { + spData.removeProtectionFromDB(block, true); } else { - EssentialsProtect.getStorage().unprotectBlock(block); + spData.removeProtectionFromDB(block); } + return; } event.setCancelled(true); return; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java index 2497a733d..c75bb6324 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java @@ -3,68 +3,92 @@ package com.earth2me.essentials.protect; import com.earth2me.essentials.Essentials; import com.earth2me.essentials.User; import org.bukkit.ChatColor; +import org.bukkit.block.Block; import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.event.player.PlayerItemEvent; import org.bukkit.event.player.PlayerListener; -import org.bukkit.event.player.PlayerPickupItemEvent; import org.bukkit.inventory.ItemStack; public class EssentialsProtectPlayerListener extends PlayerListener { private EssentialsProtect parent; - + private int signBlockX; + private int signBlockY; + private int signBlockZ; + private EssentialsProtectData spData = null; + public EssentialsProtectPlayerListener(EssentialsProtect parent) { Essentials.loadClasses(); this.parent = parent; } + public void initialize() + { + if (spData != null) return; + spData = new EssentialsProtectData(); + } + @Override public void onPlayerInteract(PlayerInteractEvent event) { + initialize(); if (event.isCancelled()) return; + ItemStack item = event.getItem(); User user = User.get(event.getPlayer()); + Block blockClicked = event.getClickedBlock(); if (EssentialsProtect.playerSettings.get("protect.disable.build") && !user.canBuild()) { event.setCancelled(true); return; } - - if (user.isAuthorized("essentials.protect.admin")) - { - StringBuilder sb = new StringBuilder(); - boolean first = true; - for (String owner : EssentialsProtect.getStorage().getOwners(event.getClickedBlock())) { - if (!first) { - sb.append(", "); - } - first = false; - sb.append(owner); - } - String ownerNames = sb.toString(); - if (ownerNames != null) - { - user.sendMessage(ChatColor.GOLD + "[EssentialsProtect] Protection owners: " + ownerNames); - } - } - } - @Override - public void onPlayerPickupItem(PlayerPickupItemEvent event) - { - if(event.isCancelled()) return; - ItemStack item = event.getItem().getItemStack(); - User user = User.get(event.getPlayer()); if (EssentialsProtect.checkProtectionItems(EssentialsProtect.usageList, item.getTypeId()) && !user.isAuthorized("essentials.protect.exemptusage")) { event.setCancelled(true); return; } + if (user.isAuthorized("essentials.protect.admin")) + { + String ownerName = spData.getBlockOwner(user.getWorld().getName(), user.getName(), + blockClicked); + if (ownerName != null) + { + user.sendMessage(ChatColor.GOLD + "[EssentialsProtect] Protection owner: " + + ownerName); + } + } if (EssentialsProtect.onUseAlert.contains(String.valueOf(item.getTypeId()))) { parent.alert(user, item.getType().toString(), "used: "); } + + if (item.getTypeId() == 323) + { + if (EssentialsProtect.genSettings.get("protect.protect.signs")) + { + if (user.isAuthorized("essentials.protect")) + { + + signBlockX = blockClicked.getX(); + signBlockY = blockClicked.getY(); + signBlockZ = blockClicked.getZ(); + + initialize(); + spData.insertProtectionIntoDb(user.getWorld().getName(), user.getName(), signBlockX, + signBlockY + 1, signBlockZ); + + if (EssentialsProtect.genSettings.get("protect.protect.block-below")) + { + spData.insertProtectionIntoDb(user.getWorld().getName(), user.getName(), signBlockX, + signBlockY, signBlockZ); + } + } + } + } + } } diff --git a/EssentialsServerlist/build.xml b/EssentialsServerlist/build.xml new file mode 100644 index 000000000..7650691f1 --- /dev/null +++ b/EssentialsServerlist/build.xml @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [ <!ENTITY buildinc SYSTEM "../build.inc.xml"> ]>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="EssentialsServerlist" default="default" basedir=".">
+ <description>Builds, tests, and runs the project EssentialsServerlist.</description>
+ <import file="nbproject/build-impl.xml"/>
+ &buildinc;
+ <!--
+
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
+
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
+ -pre-compile-single: called before javac compilation of single file
+ -post-compile-single: called after javac compilation of single file
+ -pre-compile-test: called before javac compilation of JUnit tests
+ -post-compile-test: called after javac compilation of JUnit tests
+ -pre-compile-test-single: called before javac compilation of single JUnit test
+ -post-compile-test-single: called after javac compilation of single JUunit test
+ -pre-jar: called before JAR building
+ -post-jar: called after JAR building
+ -post-clean: called after cleaning build products
+
+ (Targets beginning with '-' are not intended to be called on their own.)
+
+ Example of inserting an obfuscator after compilation could look like this:
+
+ <target name="-post-compile">
+ <obfuscate>
+ <fileset dir="${build.classes.dir}"/>
+ </obfuscate>
+ </target>
+
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
+
+
+ Another way to customize the build is by overriding existing main targets.
+ The targets of interest are:
+
+ -init-macrodef-javac: defines macro for javac compilation
+ -init-macrodef-junit: defines macro for junit execution
+ -init-macrodef-debug: defines macro for class debugging
+ -init-macrodef-java: defines macro for class execution
+ -do-jar-with-manifest: JAR building (if you are using a manifest)
+ -do-jar-without-manifest: JAR building (if you are not using a manifest)
+ run: execution of project
+ -javadoc-build: Javadoc generation
+ test-report: JUnit report generation
+
+ An example of overriding the target for project execution could look like this:
+
+ <target name="run" depends="EssentialsServerlist-impl.jar">
+ <exec dir="bin" executable="launcher.exe">
+ <arg file="${dist.jar}"/>
+ </exec>
+ </target>
+
+ Notice that the overridden target depends on the jar target and not only on
+ the compile target as the regular run target does. Again, for a list of available
+ properties which you can use, check the target you are overriding in the
+ nbproject/build-impl.xml file.
+
+ -->
+</project>
diff --git a/EssentialsServerlist/nbproject/build-impl.xml b/EssentialsServerlist/nbproject/build-impl.xml new file mode 100644 index 000000000..ee4ae2895 --- /dev/null +++ b/EssentialsServerlist/nbproject/build-impl.xml @@ -0,0 +1,1072 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT ***
+*** EDIT ../build.xml INSTEAD ***
+
+For the purpose of easier reading the script
+is divided into following sections:
+
+ - initialization
+ - compilation
+ - jar
+ - execution
+ - debugging
+ - javadoc
+ - junit compilation
+ - junit execution
+ - junit debugging
+ - applet
+ - cleanup
+
+ -->
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="EssentialsServerlist-impl">
+ <fail message="Please build using Ant 1.7.1 or higher.">
+ <condition>
+ <not>
+ <antversion atleast="1.7.1"/>
+ </not>
+ </condition>
+ </fail>
+ <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
+ <!--
+ ======================
+ INITIALIZATION SECTION
+ ======================
+ -->
+ <target name="-pre-init">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target depends="-pre-init" name="-init-private">
+ <property file="nbproject/private/config.properties"/>
+ <property file="nbproject/private/configs/${config}.properties"/>
+ <property file="nbproject/private/private.properties"/>
+ </target>
+ <target name="-pre-init-libraries">
+ <property location="../lib\nblibraries.properties" name="libraries.path"/>
+ <dirname file="${libraries.path}" property="libraries.dir.nativedirsep"/>
+ <pathconvert dirsep="/" property="libraries.dir">
+ <path path="${libraries.dir.nativedirsep}"/>
+ </pathconvert>
+ <basename file="${libraries.path}" property="libraries.basename" suffix=".properties"/>
+ <available file="${libraries.dir}/${libraries.basename}-private.properties" property="private.properties.available"/>
+ </target>
+ <target depends="-pre-init-libraries" if="private.properties.available" name="-init-private-libraries">
+ <loadproperties encoding="ISO-8859-1" srcfile="${libraries.dir}/${libraries.basename}-private.properties">
+ <filterchain>
+ <replacestring from="$${base}" to="${libraries.dir}"/>
+ <escapeunicode/>
+ </filterchain>
+ </loadproperties>
+ </target>
+ <target depends="-pre-init,-init-private,-init-private-libraries" name="-init-libraries">
+ <loadproperties encoding="ISO-8859-1" srcfile="${libraries.path}">
+ <filterchain>
+ <replacestring from="$${base}" to="${libraries.dir}"/>
+ <escapeunicode/>
+ </filterchain>
+ </loadproperties>
+ </target>
+ <target depends="-pre-init,-init-private,-init-libraries" name="-init-user">
+ <property file="${user.properties.file}"/>
+ <!-- The two properties below are usually overridden -->
+ <!-- by the active platform. Just a fallback. -->
+ <property name="default.javac.source" value="1.4"/>
+ <property name="default.javac.target" value="1.4"/>
+ </target>
+ <target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project">
+ <property file="nbproject/configs/${config}.properties"/>
+ <property file="nbproject/project.properties"/>
+ </target>
+ <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+ <available file="${manifest.file}" property="manifest.available"/>
+ <condition property="splashscreen.available">
+ <and>
+ <not>
+ <equals arg1="${application.splash}" arg2="" trim="true"/>
+ </not>
+ <available file="${application.splash}"/>
+ </and>
+ </condition>
+ <condition property="main.class.available">
+ <and>
+ <isset property="main.class"/>
+ <not>
+ <equals arg1="${main.class}" arg2="" trim="true"/>
+ </not>
+ </and>
+ </condition>
+ <condition property="manifest.available+main.class">
+ <and>
+ <isset property="manifest.available"/>
+ <isset property="main.class.available"/>
+ </and>
+ </condition>
+ <condition property="do.archive">
+ <not>
+ <istrue value="${jar.archive.disabled}"/>
+ </not>
+ </condition>
+ <condition property="do.mkdist">
+ <and>
+ <isset property="do.archive"/>
+ <isset property="libs.CopyLibs.classpath"/>
+ <not>
+ <istrue value="${mkdist.disabled}"/>
+ </not>
+ </and>
+ </condition>
+ <condition property="manifest.available+main.class+mkdist.available">
+ <and>
+ <istrue value="${manifest.available+main.class}"/>
+ <isset property="do.mkdist"/>
+ </and>
+ </condition>
+ <condition property="do.archive+manifest.available">
+ <and>
+ <isset property="manifest.available"/>
+ <istrue value="${do.archive}"/>
+ </and>
+ </condition>
+ <condition property="do.archive+main.class.available">
+ <and>
+ <isset property="main.class.available"/>
+ <istrue value="${do.archive}"/>
+ </and>
+ </condition>
+ <condition property="do.archive+splashscreen.available">
+ <and>
+ <isset property="splashscreen.available"/>
+ <istrue value="${do.archive}"/>
+ </and>
+ </condition>
+ <condition property="do.archive+manifest.available+main.class">
+ <and>
+ <istrue value="${manifest.available+main.class}"/>
+ <istrue value="${do.archive}"/>
+ </and>
+ </condition>
+ <condition property="manifest.available-mkdist.available">
+ <or>
+ <istrue value="${manifest.available}"/>
+ <isset property="do.mkdist"/>
+ </or>
+ </condition>
+ <condition property="manifest.available+main.class-mkdist.available">
+ <or>
+ <istrue value="${manifest.available+main.class}"/>
+ <isset property="do.mkdist"/>
+ </or>
+ </condition>
+ <condition property="have.tests">
+ <or>
+ <available file="${test.src.dir}"/>
+ </or>
+ </condition>
+ <condition property="have.sources">
+ <or>
+ <available file="${src.dir}"/>
+ </or>
+ </condition>
+ <condition property="netbeans.home+have.tests">
+ <and>
+ <isset property="netbeans.home"/>
+ <isset property="have.tests"/>
+ </and>
+ </condition>
+ <condition property="no.javadoc.preview">
+ <and>
+ <isset property="javadoc.preview"/>
+ <isfalse value="${javadoc.preview}"/>
+ </and>
+ </condition>
+ <property name="run.jvmargs" value=""/>
+ <property name="javac.compilerargs" value=""/>
+ <property name="work.dir" value="${basedir}"/>
+ <condition property="no.deps">
+ <and>
+ <istrue value="${no.dependencies}"/>
+ </and>
+ </condition>
+ <property name="javac.debug" value="true"/>
+ <property name="javadoc.preview" value="true"/>
+ <property name="application.args" value=""/>
+ <property name="source.encoding" value="${file.encoding}"/>
+ <property name="runtime.encoding" value="${source.encoding}"/>
+ <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
+ <and>
+ <isset property="javadoc.encoding"/>
+ <not>
+ <equals arg1="${javadoc.encoding}" arg2=""/>
+ </not>
+ </and>
+ </condition>
+ <property name="javadoc.encoding.used" value="${source.encoding}"/>
+ <property name="includes" value="**"/>
+ <property name="excludes" value=""/>
+ <property name="do.depend" value="false"/>
+ <condition property="do.depend.true">
+ <istrue value="${do.depend}"/>
+ </condition>
+ <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
+ <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
+ <length length="0" string="${endorsed.classpath}" when="greater"/>
+ </condition>
+ <property name="javac.fork" value="false"/>
+ <property name="jar.index" value="false"/>
+ <property name="jar.index.metainf" value="${jar.index}"/>
+ <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
+ </target>
+ <target name="-post-init">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check">
+ <fail unless="src.dir">Must set src.dir</fail>
+ <fail unless="test.src.dir">Must set test.src.dir</fail>
+ <fail unless="build.dir">Must set build.dir</fail>
+ <fail unless="dist.dir">Must set dist.dir</fail>
+ <fail unless="build.classes.dir">Must set build.classes.dir</fail>
+ <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
+ <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
+ <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
+ <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
+ <fail unless="dist.jar">Must set dist.jar</fail>
+ </target>
+ <target name="-init-macrodef-property">
+ <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
+ <attribute name="name"/>
+ <attribute name="value"/>
+ <sequential>
+ <property name="@{name}" value="${@{value}}"/>
+ </sequential>
+ </macrodef>
+ </target>
+ <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
+ <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+ <attribute default="${src.dir}" name="srcdir"/>
+ <attribute default="${build.classes.dir}" name="destdir"/>
+ <attribute default="${javac.classpath}" name="classpath"/>
+ <attribute default="${javac.processorpath}" name="processorpath"/>
+ <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="${javac.debug}" name="debug"/>
+ <attribute default="${empty.dir}" name="sourcepath"/>
+ <attribute default="${empty.dir}" name="gensrcdir"/>
+ <element name="customize" optional="true"/>
+ <sequential>
+ <property location="${build.dir}/empty" name="empty.dir"/>
+ <mkdir dir="${empty.dir}"/>
+ <mkdir dir="@{apgeneratedsrcdir}"/>
+ <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+ <src>
+ <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+ <include name="*"/>
+ </dirset>
+ </src>
+ <classpath>
+ <path path="@{classpath}"/>
+ </classpath>
+ <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+ <compilerarg line="${javac.compilerargs}"/>
+ <compilerarg value="-processorpath"/>
+ <compilerarg path="@{processorpath}:${empty.dir}"/>
+ <compilerarg line="${ap.processors.internal}"/>
+ <compilerarg line="${annotation.processing.processor.options}"/>
+ <compilerarg value="-s"/>
+ <compilerarg path="@{apgeneratedsrcdir}"/>
+ <compilerarg line="${ap.proc.none.internal}"/>
+ <customize/>
+ </javac>
+ </sequential>
+ </macrodef>
+ </target>
+ <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
+ <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+ <attribute default="${src.dir}" name="srcdir"/>
+ <attribute default="${build.classes.dir}" name="destdir"/>
+ <attribute default="${javac.classpath}" name="classpath"/>
+ <attribute default="${javac.processorpath}" name="processorpath"/>
+ <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="${javac.debug}" name="debug"/>
+ <attribute default="${empty.dir}" name="sourcepath"/>
+ <attribute default="${empty.dir}" name="gensrcdir"/>
+ <element name="customize" optional="true"/>
+ <sequential>
+ <property location="${build.dir}/empty" name="empty.dir"/>
+ <mkdir dir="${empty.dir}"/>
+ <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+ <src>
+ <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+ <include name="*"/>
+ </dirset>
+ </src>
+ <classpath>
+ <path path="@{classpath}"/>
+ </classpath>
+ <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+ <compilerarg line="${javac.compilerargs}"/>
+ <customize/>
+ </javac>
+ </sequential>
+ </macrodef>
+ </target>
+ <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
+ <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
+ <attribute default="${src.dir}" name="srcdir"/>
+ <attribute default="${build.classes.dir}" name="destdir"/>
+ <attribute default="${javac.classpath}" name="classpath"/>
+ <sequential>
+ <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+ <classpath>
+ <path path="@{classpath}"/>
+ </classpath>
+ </depend>
+ </sequential>
+ </macrodef>
+ <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
+ <attribute default="${build.classes.dir}" name="destdir"/>
+ <sequential>
+ <fail unless="javac.includes">Must set javac.includes</fail>
+ <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
+ <path>
+ <filelist dir="@{destdir}" files="${javac.includes}"/>
+ </path>
+ <globmapper from="*.java" to="*.class"/>
+ </pathconvert>
+ <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
+ <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
+ <delete>
+ <files includesfile="${javac.includesfile.binary}"/>
+ </delete>
+ <delete>
+ <fileset file="${javac.includesfile.binary}"/>
+ </delete>
+ </sequential>
+ </macrodef>
+ </target>
+ <target name="-init-macrodef-junit">
+ <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <sequential>
+ <property name="junit.forkmode" value="perTest"/>
+ <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+ <batchtest todir="${build.test.results.dir}">
+ <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+ <filename name="@{testincludes}"/>
+ </fileset>
+ </batchtest>
+ <classpath>
+ <path path="${run.test.classpath}"/>
+ </classpath>
+ <syspropertyset>
+ <propertyref prefix="test-sys-prop."/>
+ <mapper from="test-sys-prop.*" to="*" type="glob"/>
+ </syspropertyset>
+ <formatter type="brief" usefile="false"/>
+ <formatter type="xml"/>
+ <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+ <jvmarg value="-ea"/>
+ <jvmarg line="${run.jvmargs}"/>
+ </junit>
+ </sequential>
+ </macrodef>
+ </target>
+ <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
+ <target name="-profile-pre-init">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target name="-profile-post-init">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target name="-profile-init-macrodef-profile">
+ <macrodef name="resolve">
+ <attribute name="name"/>
+ <attribute name="value"/>
+ <sequential>
+ <property name="@{name}" value="${env.@{value}}"/>
+ </sequential>
+ </macrodef>
+ <macrodef name="profile">
+ <attribute default="${main.class}" name="classname"/>
+ <element name="customize" optional="true"/>
+ <sequential>
+ <property environment="env"/>
+ <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
+ <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
+ <jvmarg value="${profiler.info.jvmargs.agent}"/>
+ <jvmarg line="${profiler.info.jvmargs}"/>
+ <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+ <arg line="${application.args}"/>
+ <classpath>
+ <path path="${run.classpath}"/>
+ </classpath>
+ <syspropertyset>
+ <propertyref prefix="run-sys-prop."/>
+ <mapper from="run-sys-prop.*" to="*" type="glob"/>
+ </syspropertyset>
+ <customize/>
+ </java>
+ </sequential>
+ </macrodef>
+ </target>
+ <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">
+ <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
+ <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
+ </target>
+ <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
+ <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
+ <attribute default="${main.class}" name="name"/>
+ <attribute default="${debug.classpath}" name="classpath"/>
+ <attribute default="" name="stopclassname"/>
+ <sequential>
+ <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
+ <classpath>
+ <path path="@{classpath}"/>
+ </classpath>
+ </nbjpdastart>
+ </sequential>
+ </macrodef>
+ <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
+ <attribute default="${build.classes.dir}" name="dir"/>
+ <sequential>
+ <nbjpdareload>
+ <fileset dir="@{dir}" includes="${fix.classes}">
+ <include name="${fix.includes}*.class"/>
+ </fileset>
+ </nbjpdareload>
+ </sequential>
+ </macrodef>
+ </target>
+ <target name="-init-debug-args">
+ <property name="version-output" value="java version "${ant.java.version}"/>
+ <condition property="have-jdk-older-than-1.4">
+ <or>
+ <contains string="${version-output}" substring="java version "1.0"/>
+ <contains string="${version-output}" substring="java version "1.1"/>
+ <contains string="${version-output}" substring="java version "1.2"/>
+ <contains string="${version-output}" substring="java version "1.3"/>
+ </or>
+ </condition>
+ <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
+ <istrue value="${have-jdk-older-than-1.4}"/>
+ </condition>
+ <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+ <os family="windows"/>
+ </condition>
+ <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+ <isset property="debug.transport"/>
+ </condition>
+ </target>
+ <target depends="-init-debug-args" name="-init-macrodef-debug">
+ <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+ <attribute default="${main.class}" name="classname"/>
+ <attribute default="${debug.classpath}" name="classpath"/>
+ <element name="customize" optional="true"/>
+ <sequential>
+ <java classname="@{classname}" dir="${work.dir}" fork="true">
+ <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+ <jvmarg line="${debug-args-line}"/>
+ <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+ <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+ <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+ <jvmarg line="${run.jvmargs}"/>
+ <classpath>
+ <path path="@{classpath}"/>
+ </classpath>
+ <syspropertyset>
+ <propertyref prefix="run-sys-prop."/>
+ <mapper from="run-sys-prop.*" to="*" type="glob"/>
+ </syspropertyset>
+ <customize/>
+ </java>
+ </sequential>
+ </macrodef>
+ </target>
+ <target name="-init-macrodef-java">
+ <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+ <attribute default="${main.class}" name="classname"/>
+ <attribute default="${run.classpath}" name="classpath"/>
+ <element name="customize" optional="true"/>
+ <sequential>
+ <java classname="@{classname}" dir="${work.dir}" fork="true">
+ <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+ <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+ <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+ <jvmarg line="${run.jvmargs}"/>
+ <classpath>
+ <path path="@{classpath}"/>
+ </classpath>
+ <syspropertyset>
+ <propertyref prefix="run-sys-prop."/>
+ <mapper from="run-sys-prop.*" to="*" type="glob"/>
+ </syspropertyset>
+ <customize/>
+ </java>
+ </sequential>
+ </macrodef>
+ </target>
+ <target name="-init-macrodef-copylibs">
+ <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
+ <attribute default="${manifest.file}" name="manifest"/>
+ <element name="customize" optional="true"/>
+ <sequential>
+ <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+ <pathconvert property="run.classpath.without.build.classes.dir">
+ <path path="${run.classpath}"/>
+ <map from="${build.classes.dir.resolved}" to=""/>
+ </pathconvert>
+ <pathconvert pathsep=" " property="jar.classpath">
+ <path path="${run.classpath.without.build.classes.dir}"/>
+ <chainedmapper>
+ <flattenmapper/>
+ <globmapper from="*" to="lib/*"/>
+ </chainedmapper>
+ </pathconvert>
+ <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+ <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+ <fileset dir="${build.classes.dir}"/>
+ <manifest>
+ <attribute name="Class-Path" value="${jar.classpath}"/>
+ <customize/>
+ </manifest>
+ </copylibs>
+ </sequential>
+ </macrodef>
+ </target>
+ <target name="-init-presetdef-jar">
+ <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
+ <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
+ <j2seproject1:fileset dir="${build.classes.dir}"/>
+ </jar>
+ </presetdef>
+ </target>
+ <target name="-init-ap-cmdline-properties">
+ <property name="annotation.processing.enabled" value="true"/>
+ <property name="annotation.processing.processors.list" value=""/>
+ <property name="annotation.processing.processor.options" value=""/>
+ <property name="annotation.processing.run.all.processors" value="true"/>
+ <property name="javac.processorpath" value="${javac.classpath}"/>
+ <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
+ <condition property="ap.supported.internal" value="true">
+ <not>
+ <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
+ </not>
+ </condition>
+ </target>
+ <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
+ <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
+ <isfalse value="${annotation.processing.run.all.processors}"/>
+ </condition>
+ <condition else="" property="ap.proc.none.internal" value="-proc:none">
+ <isfalse value="${annotation.processing.enabled}"/>
+ </condition>
+ </target>
+ <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
+ <property name="ap.cmd.line.internal" value=""/>
+ </target>
+ <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
+ <!--
+ ===================
+ COMPILATION SECTION
+ ===================
+ -->
+ <target name="-deps-jar-init" unless="built-jar.properties">
+ <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
+ <delete file="${built-jar.properties}" quiet="true"/>
+ </target>
+ <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
+ <echo level="warn" message="Cycle detected: EssentialsServerlist was already built"/>
+ </target>
+ <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
+ <mkdir dir="${build.dir}"/>
+ <touch file="${built-jar.properties}" verbose="false"/>
+ <property file="${built-jar.properties}" prefix="already.built.jar."/>
+ <antcall target="-warn-already-built-jar"/>
+ <propertyfile file="${built-jar.properties}">
+ <entry key="${basedir}" value=""/>
+ </propertyfile>
+ <antcall target="-maybe-call-dep">
+ <param name="call.built.properties" value="${built-jar.properties}"/>
+ <param location="${project.Essentials}" name="call.subproject"/>
+ <param location="${project.Essentials}/build.xml" name="call.script"/>
+ <param name="call.target" value="jar"/>
+ <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
+ </antcall>
+ </target>
+ <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+ <target depends="init" name="-check-automatic-build">
+ <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
+ </target>
+ <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
+ <antcall target="clean"/>
+ </target>
+ <target depends="init,deps-jar" name="-pre-pre-compile">
+ <mkdir dir="${build.classes.dir}"/>
+ </target>
+ <target name="-pre-compile">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target if="do.depend.true" name="-compile-depend">
+ <pathconvert property="build.generated.subdirs">
+ <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+ <include name="*"/>
+ </dirset>
+ </pathconvert>
+ <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
+ </target>
+ <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
+ <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+ </copy>
+ </target>
+ <target if="has.persistence.xml" name="-copy-persistence-xml">
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <copy todir="${build.classes.dir}/META-INF">
+ <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
+ </copy>
+ </target>
+ <target name="-post-compile">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
+ <target name="-pre-compile-single">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
+ <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+ <j2seproject3:force-recompile/>
+ <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
+ </target>
+ <target name="-post-compile-single">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+ <!--
+ ====================
+ JAR BUILDING SECTION
+ ====================
+ -->
+ <target depends="init" name="-pre-pre-jar">
+ <dirname file="${dist.jar}" property="dist.jar.dir"/>
+ <mkdir dir="${dist.jar.dir}"/>
+ </target>
+ <target name="-pre-jar">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
+ <j2seproject1:jar/>
+ </target>
+ <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
+ <j2seproject1:jar manifest="${manifest.file}"/>
+ </target>
+ <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
+ <j2seproject1:jar manifest="${manifest.file}">
+ <j2seproject1:manifest>
+ <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
+ </j2seproject1:manifest>
+ </j2seproject1:jar>
+ <echo level="info">To run this application from the command line without Ant, try:</echo>
+ <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+ <property location="${dist.jar}" name="dist.jar.resolved"/>
+ <pathconvert property="run.classpath.with.dist.jar">
+ <path path="${run.classpath}"/>
+ <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+ </pathconvert>
+ <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
+ </target>
+ <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
+ <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
+ <touch file="${tmp.manifest.file}"/>
+ </target>
+ <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
+ <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
+ <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
+ </target>
+ <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">
+ <manifest file="${tmp.manifest.file}" mode="update">
+ <attribute name="Main-Class" value="${main.class}"/>
+ </manifest>
+ </target>
+ <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">
+ <basename file="${application.splash}" property="splashscreen.basename"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
+ <manifest file="${tmp.manifest.file}" mode="update">
+ <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
+ </manifest>
+ </target>
+ <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">
+ <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
+ <echo level="info">To run this application from the command line without Ant, try:</echo>
+ <property location="${dist.jar}" name="dist.jar.resolved"/>
+ <echo level="info">java -jar "${dist.jar.resolved}"</echo>
+ </target>
+ <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
+ <delete>
+ <fileset file="${tmp.manifest.file}"/>
+ </delete>
+ </target>
+ <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>
+ <target name="-post-jar">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
+ <!--
+ =================
+ EXECUTION SECTION
+ =================
+ -->
+ <target depends="init,compile" description="Run a main class." name="run">
+ <j2seproject1:java>
+ <customize>
+ <arg line="${application.args}"/>
+ </customize>
+ </j2seproject1:java>
+ </target>
+ <target name="-do-not-recompile">
+ <property name="javac.includes.binary" value=""/>
+ </target>
+ <target depends="init,compile-single" name="run-single">
+ <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+ <j2seproject1:java classname="${run.class}"/>
+ </target>
+ <target depends="init,compile-test-single" name="run-test-with-main">
+ <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+ <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
+ </target>
+ <!--
+ =================
+ DEBUGGING SECTION
+ =================
+ -->
+ <target depends="init" if="netbeans.home" name="-debug-start-debugger">
+ <j2seproject1:nbjpdastart name="${debug.class}"/>
+ </target>
+ <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
+ <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
+ </target>
+ <target depends="init,compile" name="-debug-start-debuggee">
+ <j2seproject3:debug>
+ <customize>
+ <arg line="${application.args}"/>
+ </customize>
+ </j2seproject3:debug>
+ </target>
+ <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
+ <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
+ <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
+ </target>
+ <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
+ <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
+ <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+ <j2seproject3:debug classname="${debug.class}"/>
+ </target>
+ <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
+ <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
+ <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+ <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
+ </target>
+ <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
+ <target depends="init" name="-pre-debug-fix">
+ <fail unless="fix.includes">Must set fix.includes</fail>
+ <property name="javac.includes" value="${fix.includes}.java"/>
+ </target>
+ <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
+ <j2seproject1:nbjpdareload/>
+ </target>
+ <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
+ <!--
+ =================
+ PROFILING SECTION
+ =================
+ -->
+ <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">
+ <nbprofiledirect>
+ <classpath>
+ <path path="${run.classpath}"/>
+ </classpath>
+ </nbprofiledirect>
+ <profile/>
+ </target>
+ <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">
+ <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
+ <nbprofiledirect>
+ <classpath>
+ <path path="${run.classpath}"/>
+ </classpath>
+ </nbprofiledirect>
+ <profile classname="${profile.class}"/>
+ </target>
+ <!--
+ =========================
+ APPLET PROFILING SECTION
+ =========================
+ -->
+ <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">
+ <nbprofiledirect>
+ <classpath>
+ <path path="${run.classpath}"/>
+ </classpath>
+ </nbprofiledirect>
+ <profile classname="sun.applet.AppletViewer">
+ <customize>
+ <arg value="${applet.url}"/>
+ </customize>
+ </profile>
+ </target>
+ <!--
+ =========================
+ TESTS PROFILING SECTION
+ =========================
+ -->
+ <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
+ <nbprofiledirect>
+ <classpath>
+ <path path="${run.test.classpath}"/>
+ </classpath>
+ </nbprofiledirect>
+ <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
+ <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+ <jvmarg value="${profiler.info.jvmargs.agent}"/>
+ <jvmarg line="${profiler.info.jvmargs}"/>
+ <test name="${profile.class}"/>
+ <classpath>
+ <path path="${run.test.classpath}"/>
+ </classpath>
+ <syspropertyset>
+ <propertyref prefix="test-sys-prop."/>
+ <mapper from="test-sys-prop.*" to="*" type="glob"/>
+ </syspropertyset>
+ <formatter type="brief" usefile="false"/>
+ <formatter type="xml"/>
+ </junit>
+ </target>
+ <!--
+ ===============
+ JAVADOC SECTION
+ ===============
+ -->
+ <target depends="init" if="have.sources" name="-javadoc-build">
+ <mkdir dir="${dist.javadoc.dir}"/>
+ <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+ <classpath>
+ <path path="${javac.classpath}"/>
+ </classpath>
+ <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+ <filename name="**/*.java"/>
+ </fileset>
+ <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+ <include name="**/*.java"/>
+ </fileset>
+ </javadoc>
+ <copy todir="${dist.javadoc.dir}">
+ <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+ <filename name="**/doc-files/**"/>
+ </fileset>
+ <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+ <include name="**/doc-files/**"/>
+ </fileset>
+ </copy>
+ </target>
+ <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
+ <nbbrowse file="${dist.javadoc.dir}/index.html"/>
+ </target>
+ <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
+ <!--
+ =========================
+ JUNIT COMPILATION SECTION
+ =========================
+ -->
+ <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
+ <mkdir dir="${build.test.classes.dir}"/>
+ </target>
+ <target name="-pre-compile-test">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target if="do.depend.true" name="-compile-test-depend">
+ <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+ </target>
+ <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
+ <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
+ <copy todir="${build.test.classes.dir}">
+ <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+ </copy>
+ </target>
+ <target name="-post-compile-test">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
+ <target name="-pre-compile-test-single">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+ <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+ <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
+ <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
+ <copy todir="${build.test.classes.dir}">
+ <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+ </copy>
+ </target>
+ <target name="-post-compile-test-single">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
+ <!--
+ =======================
+ JUNIT EXECUTION SECTION
+ =======================
+ -->
+ <target depends="init" if="have.tests" name="-pre-test-run">
+ <mkdir dir="${build.test.results.dir}"/>
+ </target>
+ <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
+ <j2seproject3:junit testincludes="**/*Test.java"/>
+ </target>
+ <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
+ <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+ </target>
+ <target depends="init" if="have.tests" name="test-report"/>
+ <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
+ <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
+ <target depends="init" if="have.tests" name="-pre-test-run-single">
+ <mkdir dir="${build.test.results.dir}"/>
+ </target>
+ <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+ <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+ <j2seproject3:junit excludes="" includes="${test.includes}"/>
+ </target>
+ <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
+ <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+ </target>
+ <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+ <!--
+ =======================
+ JUNIT DEBUGGING SECTION
+ =======================
+ -->
+ <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
+ <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+ <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
+ <delete file="${test.report.file}"/>
+ <mkdir dir="${build.test.results.dir}"/>
+ <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
+ <customize>
+ <syspropertyset>
+ <propertyref prefix="test-sys-prop."/>
+ <mapper from="test-sys-prop.*" to="*" type="glob"/>
+ </syspropertyset>
+ <arg value="${test.class}"/>
+ <arg value="showoutput=true"/>
+ <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
+ <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
+ </customize>
+ </j2seproject3:debug>
+ </target>
+ <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
+ <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
+ </target>
+ <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+ <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
+ <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
+ </target>
+ <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
+ <!--
+ =========================
+ APPLET EXECUTION SECTION
+ =========================
+ -->
+ <target depends="init,compile-single" name="run-applet">
+ <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+ <j2seproject1:java classname="sun.applet.AppletViewer">
+ <customize>
+ <arg value="${applet.url}"/>
+ </customize>
+ </j2seproject1:java>
+ </target>
+ <!--
+ =========================
+ APPLET DEBUGGING SECTION
+ =========================
+ -->
+ <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
+ <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+ <j2seproject3:debug classname="sun.applet.AppletViewer">
+ <customize>
+ <arg value="${applet.url}"/>
+ </customize>
+ </j2seproject3:debug>
+ </target>
+ <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
+ <!--
+ ===============
+ CLEANUP SECTION
+ ===============
+ -->
+ <target name="-deps-clean-init" unless="built-clean.properties">
+ <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
+ <delete file="${built-clean.properties}" quiet="true"/>
+ </target>
+ <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
+ <echo level="warn" message="Cycle detected: EssentialsServerlist was already built"/>
+ </target>
+ <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
+ <mkdir dir="${build.dir}"/>
+ <touch file="${built-clean.properties}" verbose="false"/>
+ <property file="${built-clean.properties}" prefix="already.built.clean."/>
+ <antcall target="-warn-already-built-clean"/>
+ <propertyfile file="${built-clean.properties}">
+ <entry key="${basedir}" value=""/>
+ </propertyfile>
+ <antcall target="-maybe-call-dep">
+ <param name="call.built.properties" value="${built-clean.properties}"/>
+ <param location="${project.Essentials}" name="call.subproject"/>
+ <param location="${project.Essentials}/build.xml" name="call.script"/>
+ <param name="call.target" value="clean"/>
+ <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
+ </antcall>
+ </target>
+ <target depends="init" name="-do-clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
+ </target>
+ <target name="-post-clean">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
+ <target name="-check-call-dep">
+ <property file="${call.built.properties}" prefix="already.built."/>
+ <condition property="should.call.dep">
+ <not>
+ <isset property="already.built.${call.subproject}"/>
+ </not>
+ </condition>
+ </target>
+ <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
+ <ant antfile="${call.script}" inheritall="false" target="${call.target}">
+ <propertyset>
+ <propertyref prefix="transfer."/>
+ <mapper from="transfer.*" to="*" type="glob"/>
+ </propertyset>
+ </ant>
+ </target>
+</project>
diff --git a/EssentialsServerlist/nbproject/genfiles.properties b/EssentialsServerlist/nbproject/genfiles.properties new file mode 100644 index 000000000..3255d99dc --- /dev/null +++ b/EssentialsServerlist/nbproject/genfiles.properties @@ -0,0 +1,8 @@ +build.xml.data.CRC32=b3f32d5a
+build.xml.script.CRC32=d07c143a
+build.xml.stylesheet.CRC32=28e38971@1.38.2.45
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=28f52c06
+nbproject/build-impl.xml.script.CRC32=bdef3982
+nbproject/build-impl.xml.stylesheet.CRC32=19debb58@1.42.1.45
diff --git a/EssentialsServerlist/nbproject/project.properties b/EssentialsServerlist/nbproject/project.properties new file mode 100644 index 000000000..535a1673b --- /dev/null +++ b/EssentialsServerlist/nbproject/project.properties @@ -0,0 +1,76 @@ +annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=EssentialsServerlist
+application.vendor=Paul
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+ ${run.classpath}
+debug.test.classpath=\
+ ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/EssentialsServerlist.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+file.reference.craftbukkit-0.0.1-SNAPSHOT.jar-1=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
+includes=**
+jar.compress=false
+javac.classpath=\
+ ${reference.Essentials.jar}:\
+ ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar-1}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.processorpath=\
+ ${javac.classpath}
+javac.source=1.5
+javac.target=1.5
+javac.test.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}:\
+ ${libs.junit.classpath}:\
+ ${libs.junit_4.classpath}
+javac.test.processorpath=\
+ ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+meta.inf.dir=${src.dir}/META-INF
+platform.active=default_platform
+project.Essentials=../Essentials
+reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
+run.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+ ${javac.test.classpath}:\
+ ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test
diff --git a/EssentialsServerlist/nbproject/project.xml b/EssentialsServerlist/nbproject/project.xml new file mode 100644 index 000000000..a65ec9af8 --- /dev/null +++ b/EssentialsServerlist/nbproject/project.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+ <type>org.netbeans.modules.java.j2seproject</type>
+ <configuration>
+ <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+ <name>EssentialsServerlist</name>
+ <source-roots>
+ <root id="src.dir"/>
+ </source-roots>
+ <test-roots>
+ <root id="test.src.dir"/>
+ </test-roots>
+ </data>
+ <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
+ <definitions>../lib\nblibraries.properties</definitions>
+ </libraries>
+ <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+ <reference>
+ <foreign-project>Essentials</foreign-project>
+ <artifact-type>jar</artifact-type>
+ <script>build.xml</script>
+ <target>jar</target>
+ <clean-target>clean</clean-target>
+ <id>jar</id>
+ </reference>
+ </references>
+ </configuration>
+</project>
diff --git a/EssentialsServerlist/src/net/mcserverlist/bukkit/Mcsl.java b/EssentialsServerlist/src/net/mcserverlist/bukkit/Mcsl.java new file mode 100644 index 000000000..c9b234fd7 --- /dev/null +++ b/EssentialsServerlist/src/net/mcserverlist/bukkit/Mcsl.java @@ -0,0 +1,149 @@ +package net.mcserverlist.bukkit; + +import com.earth2me.essentials.Essentials; +import java.io.*; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.event.Event; +import org.bukkit.event.Event.Priority; +import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.PluginDescriptionFile; +import org.bukkit.plugin.java.JavaPlugin; + + +public class Mcsl extends JavaPlugin +{ + private static final Logger logger = Logger.getLogger("Minecraft"); + private McslPlayerListener playerListener; + public final String author; + + public Mcsl() throws IOException + { + + PluginDescriptionFile desc = this.getDescription(); + + // Compile author list + List<String> authors = new ArrayList<String>(); + authors.add("Vimae Development"); + int alen = authors.size(); + if (alen == 1) + { + author = " by " + authors.get(0); + } + else if (alen > 1) + { + int i = 0; + StringBuilder bldr = new StringBuilder(); + for (String a : desc.getAuthors()) + { + if (i + 1 == alen) + { + if (alen > 2) bldr.append(","); + bldr.append(" and "); + } + else if (i++ > 0) + { + bldr.append(", "); + } + bldr.append(a); + } + bldr.insert(0, " by "); + author = bldr.toString(); + } + else + { + author = ""; + } + } + + @Override + public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) + { + McslCommands mcslCmd; + try + { + switch (McslCommands.valueOf(cmd.getName().toUpperCase())) + { + case WHITELIST: + whitelist(sender, WhitelistCommands.valueOf(args[0].toUpperCase()), args); + return true; + + default: + return false; + } + } + catch (IllegalArgumentException ex) + { + return false; + } + catch (Exception ex) + { + logger.log(Level.WARNING, "MCSL encountered an unknown error.", ex); + sender.sendMessage("MCSL encountered an unknown error."); + return true; + } + } + + @SuppressWarnings("LoggerStringConcat") + public void onEnable() + { + Plugin p = this.getServer().getPluginManager().getPlugin("Essentials"); + if (p != null) { + if (!this.getServer().getPluginManager().isPluginEnabled(p)) { + this.getServer().getPluginManager().enablePlugin(p); + } + } + playerListener = new McslPlayerListener(this); + getServer().getPluginManager().registerEvent(Event.Type.PLAYER_JOIN, playerListener, Priority.Monitor, this); + getServer().getPluginManager().registerEvent(Event.Type.PLAYER_QUIT, playerListener, Priority.Monitor, this); + getServer().getPluginManager().registerEvent(Event.Type.PLAYER_LOGIN, playerListener, Priority.Lowest, this); + + if (!this.getDescription().getVersion().equals(Essentials.getStatic().getDescription().getVersion())) { + logger.log(Level.WARNING, "Version mismatch! Please update all Essentials jars to the same version."); + } + logger.info(getDescription().getName() + " version " + getDescription().getVersion() + author + " enabled."); + } + + @SuppressWarnings("LoggerStringConcat") + public void onDisable() + { + logger.info(getDescription().getName() + " version " + getDescription().getVersion() + " disabled."); + } + + private void whitelist(CommandSender sender, WhitelistCommands cmd, String[] args) + { + if (!playerListener.isWhitelistEnabled()) + { + sender.sendMessage("§cThe whitelist is disabled."); + return; + } + + if (!sender.isOp()) + { + sender.sendMessage("§cYou must be an operator to manage the whitelist."); + return; + } + + switch (cmd) + { + case RELOAD: + playerListener.whitelistReload(); + sender.sendMessage("A whitelist updated has been queued."); + break; + } + } + + private enum McslCommands + { + WHITELIST + } + + private enum WhitelistCommands + { + RELOAD + } +} diff --git a/EssentialsServerlist/src/net/mcserverlist/bukkit/McslPlayerListener.java b/EssentialsServerlist/src/net/mcserverlist/bukkit/McslPlayerListener.java new file mode 100644 index 000000000..63e4343d2 --- /dev/null +++ b/EssentialsServerlist/src/net/mcserverlist/bukkit/McslPlayerListener.java @@ -0,0 +1,209 @@ +package net.mcserverlist.bukkit; + +import com.earth2me.essentials.Essentials; +import java.io.*; +import java.net.*; +import java.util.logging.*; +import org.bukkit.*; +import org.bukkit.entity.*; +import org.bukkit.event.player.*; + + +public class McslPlayerListener extends PlayerListener +{ + private final static Logger logger = Logger.getLogger("Minecraft"); + private boolean running = true; + private final Server server; + private Thread thread; + private Whitelist whitelist = null; + private volatile boolean updateNeeded = true; + + @SuppressWarnings("CallToThreadStartDuringObjectConstruction") + public McslPlayerListener(Mcsl parent) + { + this.server = parent.getServer(); + + // Get the data from the server.properties file as the server sees it, rather than reading it manually + try + { + this.whitelist = new Whitelist(server); + } + catch (Throwable ex) + { + // Disable the plugin + logger.log(Level.WARNING, "Error encountered while initializing MCServerlist plugin.", ex); + parent.getPluginLoader().disablePlugin(parent); + return; + } + + // Run Update on a set interval of 1 minute with an initial delay of 10 seconds + thread = new Thread(new UpdateRunnable()); + thread.setDaemon(true); + thread.start(); + } + + @Override + @SuppressWarnings("FinalizeDeclaration") + protected void finalize() throws Throwable + { + // Stop the timer + if (thread != null && thread.isAlive()) + { + running = false; + thread.join(); + } + + super.finalize(); + } + + @Override + public void onPlayerLogin(PlayerLoginEvent event) + { + if (event.getResult() != PlayerLoginEvent.Result.ALLOWED) + return; + + Player player = event.getPlayer(); + + // Check the whitelist + if (!Essentials.getSettings().getWhitelistEnabled() || player.isOp() || whitelist == null || whitelist.isAllowed(player.getName())) + { + // Player is an op, there is no whitelist, or the player is whitelisted. + return; + } + + // Player is not whitelisted. + event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "This server employs a whitelist."); + } + + @Override + public void onPlayerJoin(PlayerEvent event) + { + update(); + } + + @Override + public void onPlayerQuit(PlayerEvent event) + { + update(); + } + + public boolean isWhitelistEnabled() + { + return whitelist != null; + } + + public void whitelistReload() + { + whitelist.update(); + } + + public void update() + { + updateNeeded = true; + } + + + private class UpdateRunnable implements Runnable + { + @SuppressWarnings("SleepWhileInLoop") + public void run() + { + do + { + if (updateNeeded) + { + updateNeeded = false; + update(); + } + + try + { + Thread.sleep(60000); + } + catch (InterruptedException ex) + { + logger.info("Forcing MCServerlist update."); + } + } + while (running); + } + + @SuppressWarnings("CallToThreadDumpStack") + public void update() + { + // Check that we aren't receiving an event inappropriately + if (Essentials.getSettings().getMcslKey() == null || Essentials.getSettings().getMcslKey().equals("")) return; + // Compile a comma-space-delimted list of players + Player[] players = server.getOnlinePlayers(); + StringBuilder list = new StringBuilder(); + if (players.length > 0) + { + for (int i = 0; i < players.length; i++) + { + if (i > 0) list.append(", "); + list.append(players[i].getName()); + } + } + + try + { + // Compile POST data + StringBuilder data = new StringBuilder(); + data.append("key="); + data.append(URLEncoder.encode(Essentials.getSettings().getMcslKey(), "UTF-8")); + data.append("&player_count="); + data.append(Integer.toString(players.length)); + data.append("&max_players="); + data.append(Integer.toString(server.getMaxPlayers())); + data.append("&player_list="); + data.append(URLEncoder.encode(list.toString(), "UTF-8")); + + OutputStreamWriter tx = null; + BufferedReader rx = null; + try + { + // Send POST request + URL url = new URL("http://mcserverlist.net/api/update"); + // Swap line for testing purposes + //URL url = new URL("http://localhost/mcsl/update.php"); + HttpURLConnection http = (HttpURLConnection)url.openConnection(); + http.setRequestMethod("POST"); + http.setUseCaches(false); + http.setConnectTimeout(1000); + http.setAllowUserInteraction(false); + http.setInstanceFollowRedirects(true); + http.setRequestProperty("User-Agent", "Java;Mcsl"); + http.setRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8"); + http.setRequestProperty("X-Mcsl-Key", Essentials.getSettings().getMcslKey()); + http.setRequestProperty("X-Minecraft-Name", URLEncoder.encode(server.getName(), "UTF-8")); + http.setRequestProperty("X-Minecraft-Version", server.getVersion()); + http.setDoInput(true); + http.setDoOutput(true); + tx = new OutputStreamWriter(http.getOutputStream()); + tx.write(data.toString()); + tx.flush(); + + // Get the HTTP response + rx = new BufferedReader(new InputStreamReader(http.getInputStream())); + for (String l = ""; rx.ready(); l = rx.readLine()) + { + if ("".equals(l)) continue; + else if (l.startsWith("i:")) logger.info(l.substring(2)); + else if (l.startsWith("w:")) logger.warning(l.substring(2)); + else System.out.println(l); + } + } + finally + { + if (tx != null) tx.close(); + if (rx != null) rx.close(); + } + } + catch (Exception ex) + { + logger.log(Level.WARNING, "Error communication with MCServerlist.", ex); + ex.printStackTrace(); + } + } + } +} diff --git a/EssentialsServerlist/src/net/mcserverlist/bukkit/Whitelist.java b/EssentialsServerlist/src/net/mcserverlist/bukkit/Whitelist.java new file mode 100644 index 000000000..96a96ecbc --- /dev/null +++ b/EssentialsServerlist/src/net/mcserverlist/bukkit/Whitelist.java @@ -0,0 +1,107 @@ +package net.mcserverlist.bukkit; + +import com.earth2me.essentials.Essentials; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.net.HttpURLConnection; +import java.net.URL; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.bukkit.Server; + + +public class Whitelist +{ + private static final Logger logger = Logger.getLogger("Minecraft"); + private List<String> allowed = new ArrayList<String>(); + private final Object allowedLock = new Object(); + private Server server; + + public Whitelist(Server server) + { + this.server = server; + } + + public void update() + { + Thread thread = new Thread(new UpdateRunnable()); + thread.setDaemon(true); + thread.start(); + } + + public boolean isAllowed(String player) + { + String p = player.toLowerCase(); + synchronized (allowedLock) + { + return allowed.contains(p); + } + } + + private class UpdateRunnable implements Runnable + { + @SuppressWarnings("CallToThreadDumpStack") + public void run() + { + // Check that we aren't receiving an event inappropriately + if (Essentials.getSettings().getMcslKey() == null || Essentials.getSettings().getMcslKey().equals("")) return; + + try + { + OutputStreamWriter tx = null; + BufferedReader rx = null; + try + { + // Send GET request + URL url = new URL("http://mcserverlist.net/api/whitelist"); + // Swap line for testing purposes + //URL url = new URL("http://localhost/mcsl/whitelist.php"); + HttpURLConnection http = (HttpURLConnection)url.openConnection(); + http.setRequestMethod("POST"); + http.setUseCaches(false); + http.setConnectTimeout(1000); + http.setAllowUserInteraction(false); + http.setInstanceFollowRedirects(true); + http.setRequestProperty("User-Agent", "Java;Mcsl"); + http.setRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8"); + http.setRequestProperty("X-Mcsl-Key", Essentials.getSettings().getMcslKey()); + http.setRequestProperty("X-Minecraft-Name", URLEncoder.encode(server.getName(), "UTF-8")); + http.setRequestProperty("X-Minecraft-Version", server.getVersion()); + http.setDoInput(true); + http.setDoOutput(false); + + // Get the HTTP response + rx = new BufferedReader(new InputStreamReader(http.getInputStream())); + List<String> allowed = new ArrayList<String>(); + for (String l = ""; rx.ready(); l = rx.readLine()) + { + if ("".equals(l)) continue; + else if (l.startsWith("i:")) logger.info(l.substring(2)); + else if (l.startsWith("w:")) logger.warning(l.substring(2)); + else allowed.add(l.toLowerCase()); // Add to whitelist + } + + synchronized (Whitelist.this.allowedLock) + { + Whitelist.this.allowed = allowed; + allowed = null; // Remove our reference so that we don't accidentally use it + } + } + finally + { + if (tx != null) tx.close(); + if (rx != null) rx.close(); + } + } + catch (Exception ex) + { + logger.log(Level.WARNING, "Error communication with MCServerlist.", ex); + ex.printStackTrace(); + } + } + } +} diff --git a/EssentialsServerlist/src/plugin.yml b/EssentialsServerlist/src/plugin.yml new file mode 100644 index 000000000..cb6d7bddc --- /dev/null +++ b/EssentialsServerlist/src/plugin.yml @@ -0,0 +1,5 @@ +name: EssentialsServerlist
+main: net.mcserverlist.bukkit.Mcsl
+version: TeamCity
+website: http://mcserverlist.net/
+description: Official MCServerlist API implementation
\ No newline at end of file diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index 697939daa..1891e87f4 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -4,7 +4,7 @@ import com.earth2me.essentials.Essentials; import com.earth2me.essentials.User; import java.util.logging.Level; import java.util.logging.Logger; -import org.bukkit.event.player.PlayerJoinEvent; +import org.bukkit.event.player.PlayerEvent; import org.bukkit.event.player.PlayerListener; import org.bukkit.event.player.PlayerRespawnEvent; @@ -32,7 +32,7 @@ public class EssentialsSpawnPlayerListener extends PlayerListener } @Override - public void onPlayerJoin(PlayerJoinEvent event) + public void onPlayerJoin(PlayerEvent event) { Essentials.loadClasses(); User user = User.get(event.getPlayer()); |