Skip to content

Tidy things up slightly, unbox some primitives, fix some small things #1

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
hintss wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Tidy things up slightly, unbox some primitives, fix some small things #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
010ef1b
anticheat is dead (and has been), just let it die in peace
hintss Jul 24, 2015
4fc395c
slight clean-up/unboxing booleans/doubles
hintss Jul 25, 2015
cdb1d1b
fix the null check here
hintss Jul 25, 2015
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
108 changes: 0 additions & 108 deletions pom.xml.off
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/java/net/stormdev/uPlanes/api/PlaneDeathEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

public class PlaneDeathEvent extends VehicleUpdateEvent implements Cancellable {
private Plane plane;
private Boolean cancelled = false;
private boolean cancelled = false;

public PlaneDeathEvent(Vehicle vehicle, Plane plane) {
super(vehicle);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/net/stormdev/uPlanes/api/Stat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package net.stormdev.uPlanes.api;

import java.io.Serializable;

import org.bukkit.plugin.Plugin;

import java.io.Serializable;

/**
* A simple plane stat class used for adding data to the plane
*
Expand All @@ -13,7 +13,7 @@ public class Stat implements Serializable {
private static final long serialVersionUID = -7275161546527988371L;
private Object val = null;
private String statName = "";
private Boolean display = false;
private boolean display = false;
public Stat(String statName, Object val, Plugin plugin, Boolean display){
this.val = val;
this.statName = statName;
Expand All @@ -25,7 +25,7 @@ public Object getValue(){
public String getStatName(){
return statName;
}
public Boolean shouldDisplay(){
public boolean shouldDisplay(){
return display;
}
}
6 changes: 3 additions & 3 deletions src/main/java/net/stormdev/uPlanes/api/uPlaneManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ public void damagePlane(Minecart m, Plane plane, double damage, Player damager,
double health = plane.getHealth();
if(m.hasMetadata("plane.health")){
List<MetadataValue> ms = m.getMetadata("plane.health");
health = (Double) ms.get(0).value();
health = (double) ms.get(0).value();
}
String msg = Lang.get("general.damage.msg");
msg = msg.replaceAll(Pattern.quote("%damage%"), damage+"HP");
Expand Down Expand Up @@ -389,7 +389,7 @@ public void damagePlane(Minecart m, Plane plane, double damage, Player damager,
double health = plane.getHealth();
if(m.hasMetadata("plane.health")){
List<MetadataValue> ms = m.getMetadata("plane.health");
health = (Double) ms.get(0).value();
health = (double) ms.get(0).value();
}
String msg = Lang.get("general.damage.msg");
msg = msg.replaceAll(Pattern.quote("%damage%"), (damage)+"HP");
Expand Down Expand Up @@ -465,7 +465,7 @@ public void damagePlane(Minecart m, Plane plane, double damage, String cause, bo
double health = plane.getHealth();
if(m.hasMetadata("plane.health")){
List<MetadataValue> ms = m.getMetadata("plane.health");
health = (Double) ms.get(0).value();
health = (double) ms.get(0).value();
}
String msg = Lang.get("general.damage.msg");
Boolean die = false;
Expand Down
25 changes: 12 additions & 13 deletions src/main/java/net/stormdev/uPlanes/commands/AdminCommandExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,44 @@
package net.stormdev.uPlanes.commands;

import java.util.UUID;

import net.stormdev.uPlanes.api.Plane;
import net.stormdev.uPlanes.main.PlaneGenerator;
import net.stormdev.uPlanes.main.PlaneItemMethods;
import net.stormdev.uPlanes.main.main;
import net.stormdev.uPlanes.utils.Colors;
import net.stormdev.uPlanes.utils.Lang;

import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

import java.util.UUID;

public class AdminCommandExecutor implements CommandExecutor {

public boolean onCommand(CommandSender sender, Command cmd, String alias,
String[] args) {
Player player = null;
if(sender instanceof Player){
player = (Player) sender;
if(!(sender instanceof Player)){
//Player's only
sender.sendMessage(main.colors.getError()+Lang.get("general.playersOnly"));
return true;
}

Player player = ((Player) sender);

if(args.length < 1){
return false;
}

String action = args[0];
if(action.equalsIgnoreCase("give")){
if(player == null){
//Player's only
sender.sendMessage(main.colors.getError()+Lang.get("general.playersOnly"));
return true;
}
if(args.length < 2){
return false;
}
String spawnMsg = main.colors.getSuccess() + Lang.get("general.spawn.msg");
Plane plane = null;
if(args[1].equalsIgnoreCase("random")){
//Give them a random plane
Boolean hover = args[args.length-1].equalsIgnoreCase("hover");
boolean hover = args[args.length-1].equalsIgnoreCase("hover");

plane = PlaneGenerator.gen();

Expand All @@ -58,7 +57,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias,
return false;
}

Boolean hover = args[args.length-1].equalsIgnoreCase("hover");
boolean hover = args[args.length-1].equalsIgnoreCase("hover");
String rawSpeed = args[1];
String rawHealth = args[2];
String name = args[3];
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/stormdev/uPlanes/commands/AutoPilotAdminCommandExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import org.bukkit.entity.Player;

public class AutoPilotAdminCommandExecutor implements CommandExecutor {
private Boolean autoPilotEnabled;
private boolean autoPilotEnabled;
public AutoPilotAdminCommandExecutor(){
this.autoPilotEnabled = main.config.getBoolean("general.planes.autopilot");
}
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/net/stormdev/uPlanes/commands/AutoPilotCommandExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
package net.stormdev.uPlanes.commands;

import java.util.List;
import java.util.UUID;

import net.stormdev.uPlanes.api.Plane;
import net.stormdev.uPlanes.main.main;
import net.stormdev.uPlanes.utils.Colors;
import net.stormdev.uPlanes.utils.Lang;
import net.stormdev.uPlanes.utils.StatValue;

import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
Expand All @@ -17,8 +13,11 @@
import org.bukkit.entity.Minecart;
import org.bukkit.entity.Player;

import java.util.List;
import java.util.UUID;

public class AutoPilotCommandExecutor implements CommandExecutor {
private Boolean autoPilotEnabled;
private boolean autoPilotEnabled;
public AutoPilotCommandExecutor(){
this.autoPilotEnabled = main.config.getBoolean("general.planes.autopilot");
}
Expand Down
18 changes: 6 additions & 12 deletions src/main/java/net/stormdev/uPlanes/main/DestinationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
package net.stormdev.uPlanes.main;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;

import net.stormdev.uPlanes.utils.Colors;
import net.stormdev.uPlanes.utils.SerializableLocation;

import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.scheduler.BukkitRunnable;

import java.io.*;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;

public class DestinationManager {
private ConcurrentHashMap<String, SerializableLocation> destinations =
new ConcurrentHashMap<String, SerializableLocation>();
Expand All @@ -36,7 +30,7 @@ public Location getLocation(String destination, Server server){
return l;
}

public Boolean locationExists(String destination){
public boolean locationExists(String destination){
return destinations.containsKey(getCorrectName(destination));
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/stormdev/uPlanes/main/FlightControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public static Vector route(Location targetLoc, Location current, Vehicle vehicle

double x = targetLoc.getX() - current.getX();
double z = targetLoc.getZ() - current.getZ();
Boolean ux = true;
boolean ux = true;
double px = Math.abs(x);
double pz = Math.abs(z);
if (px > pz) {
Expand All @@ -84,7 +84,7 @@ public static Vector route(Location targetLoc, Location current, Vehicle vehicle
Block left = b.getRelative(DirectionUtil.getLeftOf(direction));
Block under = b.getRelative(BlockFace.DOWN);
Block underunder = under.getRelative(BlockFace.DOWN);
Boolean asc = false;
boolean asc = false;
if(current.getY()<targetHeight){
asc = true;
y = 0.6; //Go up
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/net/stormdev/uPlanes/main/ItemStackFromId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package net.stormdev.uPlanes.main;

import java.util.List;

import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;

import java.util.List;

public class ItemStackFromId {
public static ItemStack get(String raw) {
String[] parts = raw.split(":");
Expand All @@ -15,7 +15,7 @@ public static ItemStack get(String raw) {
return new ItemStack(Material.STONE);
}
short data = 0;
Boolean hasdata = false;
boolean hasdata = false;
if (parts.length > 1) {
hasdata = true;
data = Short.parseShort(parts[1]);
Expand All @@ -27,17 +27,17 @@ public static ItemStack get(String raw) {
return item;
}

public static Boolean equals(String rawid, String materialName, int tdata) {
public static boolean equals(String rawid, String materialName, int tdata) {
String[] parts = rawid.split(":");
String m = parts[0];
int data = 0;
Boolean hasdata = false;
boolean hasdata = false;
if (parts.length > 1) {
hasdata = true;
data = Integer.parseInt(parts[1]);
}
if (materialName.equalsIgnoreCase(m)) {
Boolean valid = true;
boolean valid = true;
if (hasdata) {
if (!(tdata == data)) {
valid = false;
Expand All @@ -50,7 +50,7 @@ public static Boolean equals(String rawid, String materialName, int tdata) {
return false;
}

public static Boolean equals(List<String> rawids, String materialName, int tdata) {
public static boolean equals(List<String> rawids, String materialName, int tdata) {
boolean match = false;
for(String id:rawids){
if(match || equals(id, materialName, tdata)){
Expand Down
Loading