Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,20 @@
<modelVersion>4.0.0</modelVersion>
<groupId>me.wizzledonker.plugins.trainticket</groupId>
<artifactId>TrainTicket</artifactId>
<version>1.3</version>
<version>1.5</version>
<name>TrainTicket</name>
<repositories>
<repository>
<id>bukkit-repo</id>
<url>http://repo.bukkit.org/artifactory/repo</url>
<url>http://repo.bukkit.org/content/groups/public/</url>
</repository>
<repository>
<id>vault-repo</id>
<url>http://ci.herocraftonline.com/plugin/repository/everything</url>
</repository>
<repository>
<id>sk89q-repo</id>
<url>http://maven.sk89q.com/repo/</url>
</repository>
</repositories>
<build>
Expand All @@ -24,19 +32,23 @@
</plugins>
</build>
<dependencies>
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>worldguard</artifactId>
<version>5.7.3</version>
<scope>compile</scope>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>0.0.1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
<version>1.4.7-R1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.milkbowl</groupId>
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
<version>1.1.4</version>
<type>jar</type>
<scope>compile</scope>
<version>1.4.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,22 @@

import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.bukkit.event.block.BlockListener;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.SignChangeEvent;

/**
*
* @author Win
*/
public class TrainTicketBlockListener extends BlockListener {
public class TrainTicketBlockListener implements Listener {
public static Trainticket plugin;

public TrainTicketBlockListener(Trainticket instance) {
plugin = instance;
}

@Override
@EventHandler
public void onSignChange(SignChangeEvent event) {
Player player = event.getPlayer();
if (!event.getLine(0).equalsIgnoreCase("[booth]")) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
package me.wizzledonker.plugins.trainticket;

import com.sk89q.worldguard.protection.ApplicableRegionSet;
import com.sk89q.worldguard.protection.managers.RegionManager;
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.vehicle.VehicleEnterEvent;
import org.bukkit.event.vehicle.VehicleListener;

/**
*
* @author Win
*/
public class TrainTicketListener extends VehicleListener{
public class TrainTicketListener implements Listener{

public static Trainticket plugin;

public TrainTicketListener(Trainticket instance) {
plugin = instance;
}

@Override
@EventHandler
public void onVehicleEnter(VehicleEnterEvent event) {
if (event.getEntered() instanceof Player) {
Player player = (Player) event.getEntered();
Expand All @@ -27,6 +31,18 @@ public void onVehicleEnter(VehicleEnterEvent event) {
player.sendMessage(plugin.handleMessages(2));
return;
}
if (plugin.isWorldGuard()) {
RegionManager regionManager = plugin.worldGuard.getRegionManager(player.getWorld());
ApplicableRegionSet set = regionManager.getApplicableRegions(player.getLocation());

boolean ticket = false;
for (ProtectedRegion region : set) {
if (plugin.worldGuardRegions.contains(region.getId())) {
ticket = true;
}
}
if (!ticket) return;
}
if (player.getItemInHand().getTypeId() == plugin.ticketDataValue && plugin.hasTicket(player)) {
plugin.setTicket(player, false);
player.sendMessage(plugin.handleMessages(1));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,20 @@
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;
import org.bukkit.event.player.PlayerListener;

public class TrainTicketPlayerListener extends PlayerListener {
public class TrainTicketPlayerListener implements Listener {

public static Trainticket plugin;

public TrainTicketPlayerListener(Trainticket instance) {
plugin = instance;
}

@Override
@EventHandler
public void onPlayerInteract(PlayerInteractEvent event) {
Action action = event.getAction();
if (!action.equals(Action.RIGHT_CLICK_BLOCK)) {
Expand Down
55 changes: 41 additions & 14 deletions src/main/java/me/wizzledonker/plugins/trainticket/Trainticket.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,16 @@

package me.wizzledonker.plugins.trainticket;

import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
import java.io.File;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import net.milkbowl.vault.economy.Economy;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.Event.Priority;
import org.bukkit.event.Event.Type;
import org.bukkit.event.block.BlockListener;
import org.bukkit.event.player.PlayerListener;
import org.bukkit.event.vehicle.VehicleListener;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin;
Expand All @@ -31,14 +29,16 @@
import org.bukkit.plugin.java.JavaPlugin;

public class Trainticket extends JavaPlugin {
VehicleListener signChestListener = new TrainTicketListener(this);
PlayerListener trainPlayerListener = new TrainTicketPlayerListener(this);
BlockListener trainBlockListener = new TrainTicketBlockListener(this);
TrainTicketListener signChestListener = new TrainTicketListener(this);
TrainTicketPlayerListener trainPlayerListener = new TrainTicketPlayerListener(this);
TrainTicketBlockListener trainBlockListener = new TrainTicketBlockListener(this);
public static Economy economy = null;
public WorldGuardPlugin worldGuard = null;

public boolean messagesEnable = true;
public boolean dispenseMinecart = false;
public int ticketDataValue;
public List<String> worldGuardRegions = null;

private Set<Player> ticketSet = new HashSet<Player>();

Expand All @@ -55,9 +55,14 @@ public void onEnable() {
System.out.println(this + ": Vault economy not found, switching to gold ingots!");
}

pm.registerEvent(Type.VEHICLE_ENTER, signChestListener, Priority.Normal, this);
pm.registerEvent(Type.PLAYER_INTERACT, trainPlayerListener, Priority.Normal, this);
pm.registerEvent(Type.SIGN_CHANGE, trainBlockListener, Priority.Normal, this);
worldGuard = getWorldGuard();
if (worldGuard != null) {
System.out.println(this + ": Successfully linked with WorldGuard");
}

pm.registerEvents(signChestListener, this);
pm.registerEvents(trainPlayerListener, this);
pm.registerEvents(trainBlockListener, this);
setupConfig();

System.out.println(this + " by wizzledonker loaded all events");
Expand Down Expand Up @@ -87,13 +92,18 @@ public void setupConfig() {
if (!getConfig().contains("booth.dispense_minecart")) {
getConfig().set("booth.dispense_minecart", false);
}
if (!getConfig().contains("worldguard_regions")) {
List<String> listOfStrings = Arrays.asList("trainstation", "road", "city");
getConfig().set("worldguard_regions", listOfStrings);
}

saveConfig();

//Set some variables to be used later
messagesEnable = getConfig().getBoolean("messages.enabled", true);
dispenseMinecart = getConfig().getBoolean("booth.dispense_minecart", false);
ticketDataValue = getConfig().getInt("booth.ticket_item_id", 339);
worldGuardRegions = getConfig().getStringList("worldguard_regions");

System.out.println(this + " has finished loading the config file.");
}
Expand Down Expand Up @@ -138,15 +148,17 @@ public void setTicket(Player player, boolean enabled) {
public void buyTicket(Double price, Player player) {
//All messages are taken from method (String) handleMessages()

ItemStack it = new ItemStack(ticketDataValue, 1);
if (hasTicket(player)) return;

ItemStack it = new ItemStack(ticketDataValue, 1);

if (!isGoldIngot()) {
if (!(economy.getBalance(player.getName()) > price)) {
if (!(economy.getBalance(player) > price)) {
player.sendMessage(ChatColor.RED + handleMessages(4));
return;
}
setTicket(player, true);
economy.withdrawPlayer(player.getName(), price);
economy.withdrawPlayer(player, price);
player.setItemInHand(it);
player.sendMessage(ChatColor.GREEN + handleMessages(5).replace("%price%", ChatColor.WHITE + price.toString()));
} else {
Expand Down Expand Up @@ -174,6 +186,10 @@ private boolean isGoldIngot() {
return (economy == null);
}

public boolean isWorldGuard() {
return (economy != null);
}

private Boolean setupEconomy() {
//Sets up Vault to be used with the plugin
Plugin vault = this.getServer().getPluginManager().getPlugin("Vault");
Expand All @@ -187,4 +203,15 @@ private Boolean setupEconomy() {

return (economy != null);
}

private WorldGuardPlugin getWorldGuard() {
Plugin plugin = getServer().getPluginManager().getPlugin("WorldGuard");

// WorldGuard may not be loaded
if (plugin == null || !(plugin instanceof WorldGuardPlugin)) {
return null; // Maybe you want throw an exception instead
}

return (WorldGuardPlugin) plugin;
}
}
4 changes: 2 additions & 2 deletions src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ description: Users must buy tickets before they are allowed to enter a train/car
main: me.wizzledonker.plugins.trainticket.Trainticket
name: TrainTicket
startup: postworld
version: '1.3'
softdepend: [Vault]
version: '1.5'
softdepend: [Vault, WorldGuard]
permissions:
TrainTicket.exempt:
Description: Defines whether the player is exempt from ticket payment
Expand Down