diff --git a/.gitignore b/.gitignore index e895b97..a77df83 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ *.class .project .classpath -./.settings \ No newline at end of file +/.settings/ \ No newline at end of file diff --git a/README.md b/README.md index b2c560c..2dcfdb5 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ TrainTicket TrainTicket is a bukkit plugin which allows people to use tickets before entering any vehicle -https://github.com/DrkMatr1984/TrainTicket/wiki +https://github.com/BukkitCodersUnited/TrainTicket/wiki To compile: diff --git a/pom.xml b/pom.xml index d95c12f..ad8a00e 100644 --- a/pom.xml +++ b/pom.xml @@ -9,10 +9,10 @@ bukkit-repo http://repo.bukkit.org/content/groups/public/ - - vault-repo - http://ci.herocraftonline.com/plugin/repository/everything/ - + + vault-repo + http://nexus.theyeticave.net/content/repositories/pub_releases/ + @@ -31,16 +31,16 @@ org.bukkit bukkit - 1.7.2-R0.1-SNAPSHOT + 1.7.9-R0.2 jar compile - net.milkbowl - vault - 1.2.27-SNAPSHOT + net.milkbowl.vault + Vault + 1.4.1 jar compile - \ No newline at end of file + diff --git a/src/main/java/me/wizzledonker/plugins/trainticket/TrainTicketBlockListener.java b/src/main/java/me/wizzledonker/plugins/trainticket/TrainTicketBlockListener.java index b2be6d1..1e6385a 100644 --- a/src/main/java/me/wizzledonker/plugins/trainticket/TrainTicketBlockListener.java +++ b/src/main/java/me/wizzledonker/plugins/trainticket/TrainTicketBlockListener.java @@ -1,40 +1,35 @@ -/* */ package me.wizzledonker.plugins.trainticket; -/* */ -/* */ import org.bukkit.ChatColor; -/* */ import org.bukkit.entity.Player; -/* */ import org.bukkit.event.EventHandler; -/* */ import org.bukkit.event.Listener; -/* */ import org.bukkit.event.block.SignChangeEvent; -/* */ -/* */ public class TrainTicketBlockListener -/* */ implements Listener -/* */ { -/* */ public static Trainticket plugin; -/* */ -/* */ public TrainTicketBlockListener(Trainticket instance) -/* */ { -/* 21 */ plugin = instance; -/* */ } -/* */ -/* */ @EventHandler -/* */ public void onSignChange(SignChangeEvent event) { -/* 26 */ Player player = event.getPlayer(); -/* 27 */ if (!event.getLine(0).equalsIgnoreCase("[booth]")) { -/* 28 */ return; -/* */ } -/* 30 */ if (!player.hasPermission("TrainTicket.booth.create")) { -/* 31 */ event.setLine(0, "The booth:"); -/* 32 */ return; -/* */ } -/* 34 */ if ((event.getLine(1).isEmpty()) || (event.getLine(2).isEmpty())) { -/* 35 */ player.sendMessage(ChatColor.DARK_RED + "Please fill in the missing values!"); -/* 36 */ return; -/* */ } -/* 38 */ event.setLine(0, ChatColor.GOLD + event.getLine(0)); -/* */ } -/* */ } - -/* Location: C:\Users\DrkMatr\Desktop\TrainTicket-1.4.jar - * Qualified Name: me.wizzledonker.plugins.trainticket.TrainTicketBlockListener - * JD-Core Version: 0.6.2 - */ \ No newline at end of file +package me.wizzledonker.plugins.trainticket; + +import org.bukkit.ChatColor; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.block.SignChangeEvent; + +public class TrainTicketBlockListener +implements Listener +{ + public static Trainticket plugin; + + public TrainTicketBlockListener(Trainticket instance) + { + plugin = instance; + } + + @EventHandler + public void onSignChange(SignChangeEvent event) { + Player player = event.getPlayer(); + if (!event.getLine(0).equalsIgnoreCase("[booth]")) { + return; + } + if (!player.hasPermission("TrainTicket.booth.create")) { + event.setLine(0, "The booth:"); + return; + } + if ((event.getLine(1).isEmpty()) || (event.getLine(2).isEmpty())) { + player.sendMessage(ChatColor.DARK_RED + "Please fill in the missing values!"); + return; + } + event.setLine(0, ChatColor.GOLD + event.getLine(0)); + } + } diff --git a/src/main/java/me/wizzledonker/plugins/trainticket/TrainTicketListener.java b/src/main/java/me/wizzledonker/plugins/trainticket/TrainTicketListener.java index e1fd3c4..ddbba12 100644 --- a/src/main/java/me/wizzledonker/plugins/trainticket/TrainTicketListener.java +++ b/src/main/java/me/wizzledonker/plugins/trainticket/TrainTicketListener.java @@ -1,18 +1,12 @@ package me.wizzledonker.plugins.trainticket; -import java.util.ArrayList; - import org.bukkit.Material; import org.bukkit.entity.Player; -import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.event.EventHandler; -import org.bukkit.event.vehicle.VehicleEvent; import org.bukkit.event.Listener; import org.bukkit.event.vehicle.VehicleEnterEvent; -import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.ItemMeta; public class TrainTicketListener implements Listener @@ -23,11 +17,10 @@ public TrainTicketListener(Trainticket instance) { plugin = instance; } -/* */ -/* */ -@EventHandler -/* */ public void onVehicleEnter(VehicleEnterEvent event) { + +@EventHandler +public void onVehicleEnter(VehicleEnterEvent event) { if ((event.getVehicle().getType() == EntityType.HORSE)) { return; } @@ -35,24 +28,24 @@ public TrainTicketListener(Trainticket instance) return; } if ((event.getEntered() instanceof Player)) { -/* 23 */ Player player = (Player)event.getEntered(); -/* 24 */ if (player.hasPermission("TrainTicket.exempt.cart")) { -/* 25 */ return; -/* */ } + Player player = (Player)event.getEntered(); + if (player.hasPermission("TrainTicket.exempt.cart")) { + return; + } if ((event.getVehicle().getType() == EntityType.BOAT) && player.hasPermission("TrainTicket.exempt.boat")) { return; } -/* 27 */ if (player.isInsideVehicle()) { -/* 28 */ player.sendMessage(plugin.handleMessages(Integer.valueOf(2))); -/* 29 */ return; -/* */ } + if (player.isInsideVehicle()) { + player.sendMessage(plugin.handleMessages(Integer.valueOf(2))); + return; + } if (player.getItemInHand().getAmount() != 0) { if((player.getInventory().getItemInHand().hasItemMeta() == true) && (player.getInventory().getItemInHand().getItemMeta().getDisplayName().equals(plugin.ticketName)) && (plugin.hasTicket(player) == true)) { -/* 33 */ player.sendMessage(plugin.handleMessages(Integer.valueOf(1))); -/* 34 */ if(player.getItemInHand().getAmount() == 1) + player.sendMessage(plugin.handleMessages(Integer.valueOf(1))); + if(player.getItemInHand().getAmount() == 1) { player.setItemInHand(new ItemStack(Material.AIR)); plugin.setTicket(player, false); @@ -61,7 +54,7 @@ public TrainTicketListener(Trainticket instance) player.getItemInHand().setAmount(player.getItemInHand().getAmount() - 1); plugin.setTicket(player, true); } -/* */ } + } else{ player.sendMessage(plugin.handleMessages(Integer.valueOf(3))); event.setCancelled(true); @@ -70,7 +63,7 @@ public TrainTicketListener(Trainticket instance) else { player.sendMessage(plugin.handleMessages(Integer.valueOf(3))); event.setCancelled(true); -/* */ } + } } } } diff --git a/src/main/java/me/wizzledonker/plugins/trainticket/TrainTicketPlayerListener.java b/src/main/java/me/wizzledonker/plugins/trainticket/TrainTicketPlayerListener.java index b4152f8..5d08d33 100644 --- a/src/main/java/me/wizzledonker/plugins/trainticket/TrainTicketPlayerListener.java +++ b/src/main/java/me/wizzledonker/plugins/trainticket/TrainTicketPlayerListener.java @@ -1,52 +1,47 @@ -/* */ package me.wizzledonker.plugins.trainticket; -/* */ -/* */ import org.bukkit.ChatColor; -/* */ import org.bukkit.Material; -/* */ import org.bukkit.block.Block; -/* */ import org.bukkit.block.Sign; -/* */ import org.bukkit.entity.Player; -/* */ import org.bukkit.event.EventHandler; -/* */ import org.bukkit.event.Listener; -/* */ import org.bukkit.event.block.Action; -/* */ import org.bukkit.event.player.PlayerInteractEvent; -/* */ -/* */ public class TrainTicketPlayerListener -/* */ implements Listener -/* */ { -/* */ public static Trainticket plugin; -/* */ -/* */ public TrainTicketPlayerListener(Trainticket instance) -/* */ { -/* 22 */ plugin = instance; -/* */ } -/* */ -/* */ @EventHandler -/* */ public void onPlayerInteract(PlayerInteractEvent event) { -/* 27 */ Action action = event.getAction(); -/* 28 */ if (!action.equals(Action.RIGHT_CLICK_BLOCK)) { -/* 29 */ return; -/* */ } -/* 31 */ Player player = event.getPlayer(); -/* 32 */ if (!player.hasPermission("TrainTicket.booth.use")) { -/* 33 */ return; -/* */ } -/* 35 */ Block block = event.getClickedBlock(); -/* 36 */ if ((!block.getType().equals(Material.SIGN_POST)) && (!block.getType().equals(Material.WALL_SIGN))) { -/* 37 */ return; -/* */ } -/* 39 */ Sign sign = (Sign)block.getState(); -/* 40 */ if (!sign.getLine(0).equalsIgnoreCase(ChatColor.GOLD + "[booth]")) { -/* 41 */ return; -/* */ } -/* 43 */ if ((sign.getLine(1).isEmpty()) || (sign.getLine(2).isEmpty())) { -/* 44 */ player.sendMessage(ChatColor.RED + "That ticket booth is incomplete!"); -/* 45 */ return; -/* */ } -/* 47 */ plugin.buyTicket(Double.valueOf(Double.parseDouble(sign.getLine(2))), player); -/* */ } -/* */ } +package me.wizzledonker.plugins.trainticket; -/* Location: C:\Users\DrkMatr\Desktop\TrainTicket-1.4.jar - * Qualified Name: me.wizzledonker.plugins.trainticket.TrainTicketPlayerListener - * JD-Core Version: 0.6.2 - */ \ No newline at end of file +import org.bukkit.ChatColor; +import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.block.Sign; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.block.Action; +import org.bukkit.event.player.PlayerInteractEvent; + +public class TrainTicketPlayerListener + implements Listener +{ + public static Trainticket plugin; + + public TrainTicketPlayerListener(Trainticket instance) + { + plugin = instance; + } + + @EventHandler + public void onPlayerInteract(PlayerInteractEvent event) { + Action action = event.getAction(); + if (!action.equals(Action.RIGHT_CLICK_BLOCK)) { + return; + } + Player player = event.getPlayer(); + if (!player.hasPermission("TrainTicket.booth.use")) { + return; + } + Block block = event.getClickedBlock(); + if ((!block.getType().equals(Material.SIGN_POST)) && (!block.getType().equals(Material.WALL_SIGN))) { + return; + } + Sign sign = (Sign)block.getState(); + if (!sign.getLine(0).equalsIgnoreCase(ChatColor.GOLD + "[booth]")) { + return; + } + if ((sign.getLine(1).isEmpty()) || (sign.getLine(2).isEmpty())) { + player.sendMessage(ChatColor.RED + "That ticket booth is incomplete!"); + return; + } + plugin.buyTicket(Double.valueOf(Double.parseDouble(sign.getLine(2))), player); + } + } diff --git a/src/main/java/me/wizzledonker/plugins/trainticket/Trainticket.java b/src/main/java/me/wizzledonker/plugins/trainticket/Trainticket.java index 92c1425..72c1e82 100644 --- a/src/main/java/me/wizzledonker/plugins/trainticket/Trainticket.java +++ b/src/main/java/me/wizzledonker/plugins/trainticket/Trainticket.java @@ -1,7 +1,6 @@ package me.wizzledonker.plugins.trainticket; import java.io.File; -import java.io.PrintStream; import java.util.ArrayList; import java.util.HashSet; import java.util.Set; @@ -10,18 +9,12 @@ import org.bukkit.ChatColor; import org.bukkit.Material; -import org.bukkit.Server; -import org.bukkit.World; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.configuration.file.FileConfigurationOptions; import org.bukkit.entity.Player; -import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.RegisteredServiceProvider; -import org.bukkit.plugin.ServicesManager; import org.bukkit.plugin.java.JavaPlugin; @@ -39,28 +32,29 @@ public class Trainticket extends JavaPlugin public String ticketName = "TrainTicket"; public String ticketLore1 = "Allows you to ride"; public String ticketLore2 = "In Minecarts/Boats"; -private Set ticketSet = new HashSet(); +private Set ticketSet = new HashSet(); public ItemStack is; public ItemMeta ticket; - public void onDisable() +public void onDisable() { -/* 42 */ System.out.println(this + " is now disabled!"); + System.out.println(this + " is now disabled!"); } - public void onEnable() { -/* 46 */ PluginManager pm = getServer().getPluginManager(); -/* 47 */ if (setupEconomy().booleanValue()) -/* 48 */ System.out.println(this + " has successfully linked with " + economy.getName() + ", via Vault"); - else { -/* 50 */ System.out.println(this + ": Vault economy not found, switching to gold ingots!"); +@SuppressWarnings("deprecation") +public void onEnable() { + PluginManager pm = getServer().getPluginManager(); + if (setupEconomy().booleanValue()) + System.out.println(this + " has successfully linked with " + economy.getName() + ", via Vault"); + else { + System.out.println(this + ": Vault economy not found, switching to gold ingots!"); } -/* 53 */ pm.registerEvents(this.signChestListener, this); -/* 54 */ pm.registerEvents(this.trainPlayerListener, this); -/* 55 */ pm.registerEvents(this.trainBlockListener, this); + pm.registerEvents(this.signChestListener, this); + pm.registerEvents(this.trainPlayerListener, this); + pm.registerEvents(this.trainBlockListener, this); pm.registerEvents(this.trainLoginListener, this); -/* 56 */ setupConfig(); + setupConfig(); /*Initialize Custom Ticket Item*/ is = new ItemStack(Material.getMaterial(ticketDataValue), 1); ticket = is.getItemMeta(); @@ -70,7 +64,7 @@ public void onEnable() { lore.add(ticketLore2); ticket.setLore(lore); is.setItemMeta(ticket); -/* 58 */ System.out.println(this + " by wizzledonker loaded all events"); + System.out.println(this + " by wizzledonker loaded all events"); } public void setupConfig() @@ -150,7 +144,8 @@ else if ((hasTicket(player)) && (enabled == true)) { this.ticketSet.add(player); else if ((!hasTicket(player)) && (!enabled)); } - public void buyTicket(Double price, Player player){ + @SuppressWarnings("deprecation") +public void buyTicket(Double price, Player player){ Player p = player; if (!isGoldIngot()) { if (economy.getBalance(player.getName()) <= price.doubleValue()) { @@ -204,7 +199,7 @@ private Boolean setupEconomy() if (vault == null) { return Boolean.valueOf(false); } - RegisteredServiceProvider economyProvider = getServer().getServicesManager().getRegistration(Economy.class); + RegisteredServiceProvider economyProvider = getServer().getServicesManager().getRegistration(Economy.class); if (economyProvider != null) { economy = (Economy)economyProvider.getProvider(); } @@ -240,7 +235,8 @@ private int goldCounter(Player player){ /*Count the total number of Gold Ingo return gold; } - private void takeGold(int Price, Player player){ /*Take Gold Ingots from Inventory if using Gold Ingot System*/ + @SuppressWarnings("deprecation") +private void takeGold(int Price, Player player){ /*Take Gold Ingots from Inventory if using Gold Ingot System*/ int change; int goldLeft = Price; for (ItemStack i : player.getInventory().getContents()){