Skip to content

More Code Formatting, Updated sources to 1.7.2 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DrkMatr1984 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

More Code Formatting, Updated sources to 1.7.2 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10a7763
More Code Formatting, Updated sources to 1.7.2
DrkMatr1984 Sep 7, 2014
2499215
Fix formatting error
DrkMatr1984 Sep 8, 2014
de3b94b
Update README.md
DrkMatr1984 Sep 16, 2014
a6f325a
Updated to bukkit 1.7.9r02 and vault 1.4.1 Maven Dependencies
DrkMatr1984 Sep 16, 2014
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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
*.class
.project
.classpath
./.settings
/.settings/
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
18 changes: 9 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
<id>bukkit-repo</id>
<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>vault-repo</id>
<url>http://nexus.theyeticave.net/content/repositories/pub_releases/</url>
</repository>
</repositories>
<build>
<plugins>
Expand All @@ -31,16 +31,16 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.7.2-R0.1-SNAPSHOT</version>
<version>1.7.9-R0.2</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.milkbowl</groupId>
<artifactId>vault</artifactId>
<version>1.2.27-SNAPSHOT</version>
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
<version>1.4.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
</project>
75 changes: 35 additions & 40 deletions src/main/java/me/wizzledonker/plugins/trainticket/TrainTicketBlockListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
*/
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));
}
}
37 changes: 15 additions & 22 deletions src/main/java/me/wizzledonker/plugins/trainticket/TrainTicketListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -23,36 +17,35 @@ 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;
}
if ((event.getVehicle().getType() == EntityType.PIG)) {
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);
Expand All @@ -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);
Expand All @@ -70,7 +63,7 @@ public TrainTicketListener(Trainticket instance)
else {
player.sendMessage(plugin.handleMessages(Integer.valueOf(3)));
event.setCancelled(true);
/* */ }
}
}
}
}
97 changes: 46 additions & 51 deletions src/main/java/me/wizzledonker/plugins/trainticket/TrainTicketPlayerListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
*/
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);
}
}
Loading