craftinc/craftinc-gates
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #34 from craftinc/refactor/cleanup

Browse Source 
Code formatting
This commit is contained in:
Tobias Ottenweller 2016-12-31 12:05:14 +01:00 committed by GitHub
commit 927b70fd2d
37 changed files with 1749 additions and 2094 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/de/craftinc/gates/Gate.java
View File

@ -27,8 +27,7 @@ import org.bukkit.configuration.serialization.ConfigurationSerializable;
import java.util.*; import java.util.*;
public class Gate implements ConfigurationSerializable public class Gate implements ConfigurationSerializable {
{
protected Location location; /* saving both location and gateBlockLocations is redundant but makes it easy to allow players to reshape gates */ protected Location location; /* saving both location and gateBlockLocations is redundant but makes it easy to allow players to reshape gates */
protected Set<Location> gateBlockLocations = new HashSet<Location>(); /* Locations of the blocks inside the gate */ protected Set<Location> gateBlockLocations = new HashSet<Location>(); /* Locations of the blocks inside the gate */
protected Set<Block> gateFrameBlocks = new HashSet<Block>(); protected Set<Block> gateFrameBlocks = new HashSet<Block>();
@ -44,46 +43,40 @@ public class Gate implements ConfigurationSerializable
/** /**
* You should never create two gates with the same 'id'. Also see 'setId(String id)'. * You should never create two gates with the same 'id'. Also see 'setId(String id)'.
*
* @param id This parameter must not be 'null'. An exception will be thrown otherwise! * @param id This parameter must not be 'null'. An exception will be thrown otherwise!
*/ */
public Gate(final String id) public Gate(final String id) {
{
setId(id); setId(id);
} }
public String toString() public String toString() {
{
return super.toString() + " " + this.getId(); return super.toString() + " " + this.getId();
} }
/** /**
*
* @return This method might return a 'null' data. * @return This method might return a 'null' data.
*/ */
public Location getLocation() public Location getLocation() {
{
return location; return location;
} }
/** /**
*
* @param location Supplying 'null' is permitted. * @param location Supplying 'null' is permitted.
* @throws Exception Will throw an exception if the gate is open and an invalid (no gate frame) location is * @throws Exception Will throw an exception if the gate is open and an invalid (no gate frame) location is
* supplied. Note that the supplied 'location' will be set even if an exception is thrown. Note that this * supplied. Note that the supplied 'location' will be set even if an exception is thrown. Note that this
* gate will be closed if an exception is thrown. * gate will be closed if an exception is thrown.
*/ */
public void setLocation(final Location location) throws Exception public void setLocation(final Location location) throws Exception {
{
this.location = location; this.location = location;
if (isOpen) { if (isOpen) {
findPortalBlocks(); findPortalBlocks();
validate(); validate();
} } else {
else {
this.gateBlockLocations = new HashSet<Location>(); this.gateBlockLocations = new HashSet<Location>();
this.gateFrameBlocks = new HashSet<Block>(); this.gateFrameBlocks = new HashSet<Block>();
} }
@ -91,35 +84,29 @@ public class Gate implements ConfigurationSerializable
/** /**
*
* @return This method might return a 'null' value. * @return This method might return a 'null' value.
*/ */
public Location getExit() public Location getExit() {
{
return exit; return exit;
} }
/** /**
*
* @param exit Supplying 'null' is permitted. * @param exit Supplying 'null' is permitted.
* @throws Exception An exception will be thrown if 'null' data is supplied and this gate is open. Note that the * @throws Exception An exception will be thrown if 'null' data is supplied and this gate is open. Note that the
* supplied 'exit' will be set even if an exception is thrown. Note that this gate will be closed if an * supplied 'exit' will be set even if an exception is thrown. Note that this gate will be closed if an
* exception is thrown. * exception is thrown.
*/ */
public void setExit(final Location exit) throws Exception public void setExit(final Location exit) throws Exception {
{
this.exit = exit; this.exit = exit;
validate(); validate();
} }
/** /**
*
* @return This method will never return 'null'. * @return This method will never return 'null'.
*/ */
public String getId() public String getId() {
{
return id; return id;
} }
@ -127,10 +114,10 @@ public class Gate implements ConfigurationSerializable
/** /**
* Every gate should have an unique 'id'. You should therefore check if another gate with the same 'id' exists. * Every gate should have an unique 'id'. You should therefore check if another gate with the same 'id' exists.
* Note that this method will not check if another gate with the same 'id' exists! * Note that this method will not check if another gate with the same 'id' exists!
*
* @param id This parameter must not be 'null'. An exception will be thrown otherwise! * @param id This parameter must not be 'null'. An exception will be thrown otherwise!
*/ */
public void setId(final String id) public void setId(final String id) {
{
if (id == null) { if (id == null) {
throw new IllegalArgumentException("gate 'id' cannot be 'null'"); throw new IllegalArgumentException("gate 'id' cannot be 'null'");
} }
@ -139,27 +126,23 @@ public class Gate implements ConfigurationSerializable
} }
public boolean isHidden() public boolean isHidden() {
{
return isHidden; return isHidden;
} }
public void setHidden(boolean isHidden) throws Exception public void setHidden(boolean isHidden) throws Exception {
{
this.isHidden = isHidden; this.isHidden = isHidden;
this.validate(); this.validate();
} }
public boolean isOpen() public boolean isOpen() {
{
return isOpen; return isOpen;
} }
public void setOpen(boolean isOpen) throws Exception public void setOpen(boolean isOpen) throws Exception {
{
if (isOpen && !this.isOpen) { if (isOpen && !this.isOpen) {
findPortalBlocks(); findPortalBlocks();
} }
@ -169,41 +152,33 @@ public class Gate implements ConfigurationSerializable
} }
public void setAllowsVehicles(boolean allowsVehicles) public void setAllowsVehicles(boolean allowsVehicles) {
{
this.allowsVehicles = allowsVehicles; this.allowsVehicles = allowsVehicles;
} }
public boolean getAllowsVehicles() public boolean getAllowsVehicles() {
{
return this.allowsVehicles; return this.allowsVehicles;
} }
/** /**
*
* @return Will never return 'null' but might return an empty Set. * @return Will never return 'null' but might return an empty Set.
*/ */
public Set<Location> getGateBlockLocations() public Set<Location> getGateBlockLocations() {
{
return gateBlockLocations; return gateBlockLocations;
} }
/** /**
*
* @return Will never return 'null' but might return an empty Set. * @return Will never return 'null' but might return an empty Set.
*/ */
public Set<Block> getGateFrameBlocks() public Set<Block> getGateFrameBlocks() {
{
return gateFrameBlocks; return gateFrameBlocks;
} }
protected void findPortalBlocks() {
protected void findPortalBlocks()
{
gateBlockLocations = new HashSet<Location>(); gateBlockLocations = new HashSet<Location>();
Set<Block> gateBlocks = FloodUtil.getGatePortalBlocks(location.getBlock()); Set<Block> gateBlocks = FloodUtil.getGatePortalBlocks(location.getBlock());
@ -220,8 +195,7 @@ public class Gate implements ConfigurationSerializable
/** /**
* Checks if values attributes do add up; will close gate on wrong values. * Checks if values attributes do add up; will close gate on wrong values.
*/ */
public void validate() throws Exception public void validate() throws Exception {
{
if (!isOpen) { if (!isOpen) {
return; return;
} }
@ -283,41 +257,39 @@ public class Gate implements ConfigurationSerializable
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public Gate(Map<String, Object> map) public Gate(Map<String, Object> map) {
{
try { try {
id = map.get(idKey).toString().toLowerCase(); id = map.get(idKey).toString().toLowerCase();
isHidden = (Boolean)map.get(isHiddenKey); isHidden = (Boolean) map.get(isHiddenKey);
isOpen = (Boolean)map.get(isOpenKey); isOpen = (Boolean) map.get(isOpenKey);
location = LocationUtil.deserializeLocation((Map<String, Object>) map.get(locationKey)); location = LocationUtil.deserializeLocation((Map<String, Object>) map.get(locationKey));
exit = LocationUtil.deserializeLocation((Map<String, Object>) map.get(exitKey)); exit = LocationUtil.deserializeLocation((Map<String, Object>) map.get(exitKey));
if (map.containsKey(exitPitchKey)) { if (map.containsKey(exitPitchKey)) {
exit.setPitch(((Number)map.get(exitPitchKey)).floatValue()); exit.setPitch(((Number) map.get(exitPitchKey)).floatValue());
exit.setYaw(((Number)map.get(exitYawKey)).floatValue()); exit.setYaw(((Number) map.get(exitYawKey)).floatValue());
} }
if (map.containsKey(locationPitchKey)) { if (map.containsKey(locationPitchKey)) {
location.setPitch(((Number)map.get(locationPitchKey)).floatValue()); location.setPitch(((Number) map.get(locationPitchKey)).floatValue());
location.setYaw(((Number)map.get(locationYawKey)).floatValue()); location.setYaw(((Number) map.get(locationYawKey)).floatValue());
} }
if (map.containsKey(allowsVehiclesKey)) { if (map.containsKey(allowsVehiclesKey)) {
allowsVehicles = (Boolean)map.get(allowsVehiclesKey); allowsVehicles = (Boolean) map.get(allowsVehiclesKey);
} }
gateBlockLocations = new HashSet<Location>(); gateBlockLocations = new HashSet<Location>();
List<Map<String, Object>> serializedGateBlocks = (List<Map<String, Object>>)map.get(gateBlocksKey); List<Map<String, Object>> serializedGateBlocks = (List<Map<String, Object>>) map.get(gateBlocksKey);
for (Map<String, Object> sgb : serializedGateBlocks) { for (Map<String, Object> sgb : serializedGateBlocks) {
gateBlockLocations.add(LocationUtil.deserializeLocation(sgb)); gateBlockLocations.add(LocationUtil.deserializeLocation(sgb));
} }
gateFrameBlocks = FloodUtil.getFrameWithLocations(gateBlockLocations); gateFrameBlocks = FloodUtil.getFrameWithLocations(gateBlockLocations);
} } catch (Exception e) {
catch (Exception e) {
Plugin.log("ERROR: Failed to load gate '" + id + "'! (" + e.getMessage() + ")"); Plugin.log("ERROR: Failed to load gate '" + id + "'! (" + e.getMessage() + ")");
Plugin.log("NOTE: This gate will be removed from 'gates.yml' and added to 'invalid_gates.yml'!"); Plugin.log("NOTE: This gate will be removed from 'gates.yml' and added to 'invalid_gates.yml'!");
@ -326,15 +298,13 @@ public class Gate implements ConfigurationSerializable
try { try {
validate(); // make sure to not write invalid stuff to disk validate(); // make sure to not write invalid stuff to disk
} } catch (Exception e) {
catch (Exception e) {
Plugin.log("The loaded gate " + this.getId() + " seems to be not valid: " + e.getMessage()); Plugin.log("The loaded gate " + this.getId() + " seems to be not valid: " + e.getMessage());
} }
} }
public Map<String, Object> serialize() public Map<String, Object> serialize() {
{
Map<String, Object> retVal = new HashMap<String, Object>(); Map<String, Object> retVal = new HashMap<String, Object>();
retVal.put(idKey, id); retVal.put(idKey, id);

5
src/de/craftinc/gates/GateChangeListener.java
View File

@ -19,13 +19,12 @@ package de.craftinc.gates;
import java.util.Map; import java.util.Map;
public interface GateChangeListener public interface GateChangeListener {
{
public static final String newGate = "GateChangeListener-newGate"; // value will be null public static final String newGate = "GateChangeListener-newGate"; // value will be null
public static final String removedGate = "GateChangeListener-removedGate"; // value will be null public static final String removedGate = "GateChangeListener-removedGate"; // value will be null
public static final String changedID = "GateChangeListener-changedID"; // value will be the old ID public static final String changedID = "GateChangeListener-changedID"; // value will be the old ID
public static final String changedLocation = "GateChangeListener-changedLocation"; // value will the old location public static final String changedLocation = "GateChangeListener-changedLocation"; // value will the old location
public static final String changedExit = "GateChangeListener-changedExit"; // value will be the old exit public static final String changedExit = "GateChangeListener-changedExit"; // value will be the old exit
public void gateChangedHandler(final Gate g, final Map<String, Object>changeSet); public void gateChangedHandler(final Gate g, final Map<String, Object> changeSet);
} }

142
src/de/craftinc/gates/GatesManager.java
View File

@ -35,8 +35,7 @@ import de.craftinc.gates.util.SimpleChunk;
import de.craftinc.gates.util.SimpleLocation; import de.craftinc.gates.util.SimpleLocation;
public class GatesManager public class GatesManager {
{
protected File gatesConfigFile; protected File gatesConfigFile;
protected FileConfiguration gatesConfig; protected FileConfiguration gatesConfig;
protected static final String gatesPath = "gates"; // path to gates inside the yaml file protected static final String gatesPath = "gates"; // path to gates inside the yaml file
@ -57,26 +56,22 @@ public class GatesManager
protected Set<GateChangeListener> changeListeners = new HashSet<GateChangeListener>(); protected Set<GateChangeListener> changeListeners = new HashSet<GateChangeListener>();
public void addGateChangeListener(GateChangeListener listener) public void addGateChangeListener(GateChangeListener listener) {
{
this.changeListeners.add(listener); this.changeListeners.add(listener);
} }
public void removeGateChangeListener(GateChangeListener listener) public void removeGateChangeListener(GateChangeListener listener) {
{
this.changeListeners.remove(listener); this.changeListeners.remove(listener);
} }
public Gate getGateWithId(final String id) public Gate getGateWithId(final String id) {
{
return gatesById.get(id.toLowerCase()); return gatesById.get(id.toLowerCase());
} }
public Set<Gate> getNearbyGates(final Chunk chunk) public Set<Gate> getNearbyGates(final Chunk chunk) {
{
SimpleChunk simpleChunk = new SimpleChunk(chunk); SimpleChunk simpleChunk = new SimpleChunk(chunk);
return gatesByChunk.get(simpleChunk); return gatesByChunk.get(simpleChunk);
} }
@ -84,11 +79,11 @@ public class GatesManager
/** /**
* Returns the closest gate. * Returns the closest gate.
*
* @param location The location at which to look for a gate. * @param location The location at which to look for a gate.
* @return Might return null if there are no nearby gates. * @return Might return null if there are no nearby gates.
*/ */
public Gate getNearestGate(final Location location) public Gate getNearestGate(final Location location) {
{
Set<Gate> nearbyGates = getNearbyGates(location.getChunk()); Set<Gate> nearbyGates = getNearbyGates(location.getChunk());
if (nearbyGates == null) { if (nearbyGates == null) {
@ -111,22 +106,19 @@ public class GatesManager
} }
public Gate getGateAtLocation(final Location location) public Gate getGateAtLocation(final Location location) {
{
SimpleLocation simpleLocation = new SimpleLocation(location); SimpleLocation simpleLocation = new SimpleLocation(location);
return gatesByLocation.get(simpleLocation); return gatesByLocation.get(simpleLocation);
} }
public Gate getGateAtFrameLocation(final Location location) public Gate getGateAtFrameLocation(final Location location) {
{
SimpleLocation simpleLocation = new SimpleLocation(location); SimpleLocation simpleLocation = new SimpleLocation(location);
return gatesByFrameLocation.get(simpleLocation); return gatesByFrameLocation.get(simpleLocation);
} }
public void saveGatesToDisk() public void saveGatesToDisk() {
{
if (storageFileIsInvalid) { if (storageFileIsInvalid) {
Plugin.log(Level.SEVERE, "ERROR: Not saving gates to disk. Storage file is invalid or corrupted!"); Plugin.log(Level.SEVERE, "ERROR: Not saving gates to disk. Storage file is invalid or corrupted!");
return; return;
@ -138,8 +130,7 @@ public class GatesManager
try { try {
gatesConfig.save(gatesConfigFile); gatesConfig.save(gatesConfigFile);
Plugin.log("Saved gates to disk."); Plugin.log("Saved gates to disk.");
} } catch (IOException e) {
catch (IOException e) {
Plugin.log(Level.SEVERE, "ERROR: Could not save gates to disk."); Plugin.log(Level.SEVERE, "ERROR: Could not save gates to disk.");
e.printStackTrace(); e.printStackTrace();
} }
@ -147,19 +138,17 @@ public class GatesManager
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public boolean loadGatesFromDisk() public boolean loadGatesFromDisk() {
{
this.gatesConfigFile = new File(Plugin.getPlugin().getDataFolder(), "gates.yml"); this.gatesConfigFile = new File(Plugin.getPlugin().getDataFolder(), "gates.yml");
if(!this.gatesConfigFile.exists()) { if (!this.gatesConfigFile.exists()) {
try { try {
boolean isNew = this.gatesConfigFile.createNewFile(); boolean isNew = this.gatesConfigFile.createNewFile();
if (isNew) { if (isNew) {
Plugin.log(Level.FINEST, "Created gate storage file."); Plugin.log(Level.FINEST, "Created gate storage file.");
} }
} } catch (IOException e) {
catch (IOException e) {
this.storageFileIsInvalid = true; this.storageFileIsInvalid = true;
Plugin.log(Level.SEVERE, "Cannot create gate storage file! No gates will be persisted."); Plugin.log(Level.SEVERE, "Cannot create gate storage file! No gates will be persisted.");
return false; return false;
@ -170,14 +159,13 @@ public class GatesManager
try { try {
this.gatesConfig.load(this.gatesConfigFile); this.gatesConfig.load(this.gatesConfigFile);
} } catch (Exception e) {
catch (Exception e) {
this.storageFileIsInvalid = true; this.storageFileIsInvalid = true;
Plugin.log(Level.SEVERE, "Gate file on disk is invalid. No gates loaded. Plugin will be disabled! (" + Arrays.toString(e.getStackTrace()) + ")"); Plugin.log(Level.SEVERE, "Gate file on disk is invalid. No gates loaded. Plugin will be disabled! (" + Arrays.toString(e.getStackTrace()) + ")");
return false; return false;
} }
this.gates = (List<Gate>)gatesConfig.getList(gatesPath); this.gates = (List<Gate>) gatesConfig.getList(gatesPath);
if (this.gates == null) { if (this.gates == null) {
this.gates = new ArrayList<Gate>(); this.gates = new ArrayList<Gate>();
@ -195,12 +183,11 @@ public class GatesManager
for (Gate g : this.gates) { for (Gate g : this.gates) {
try { try {
g.validate(); g.validate();
} } catch (Exception e) {
catch (Exception e) {
try { try {
g.setOpen(false); g.setOpen(false);
} catch (Exception ignored) {
} }
catch (Exception ignored) { }
Plugin.log(Level.FINER, "closed gate '" + g.getId() + "' reason: " + e.getMessage()); Plugin.log(Level.FINER, "closed gate '" + g.getId() + "' reason: " + e.getMessage());
} }
@ -234,8 +221,7 @@ public class GatesManager
} }
protected int getChunkRadius() protected int getChunkRadius() {
{
if (this.chunkRadius == 0) { if (this.chunkRadius == 0) {
this.chunkRadius = Plugin.getPlugin().getConfig().getInt(ConfigurationUtil.confPlayerGateBlockUpdateRadiusKey); this.chunkRadius = Plugin.getPlugin().getConfig().getInt(ConfigurationUtil.confPlayerGateBlockUpdateRadiusKey);
this.chunkRadius = this.chunkRadius >> 4; this.chunkRadius = this.chunkRadius >> 4;
@ -245,9 +231,8 @@ public class GatesManager
} }
protected void fillGatesById() protected void fillGatesById() {
{ gatesById = new HashMap<String, Gate>((int) (gates.size() * 1.25));
gatesById = new HashMap<String, Gate>((int)(gates.size() * 1.25));
for (Gate g : gates) { for (Gate g : gates) {
this.addGateWithId(g); this.addGateWithId(g);
@ -255,8 +240,7 @@ public class GatesManager
} }
protected void fillGatesByChunk() protected void fillGatesByChunk() {
{
HashSet<SimpleChunk> chunksUsedByGates = new HashSet<SimpleChunk>(); HashSet<SimpleChunk> chunksUsedByGates = new HashSet<SimpleChunk>();
for (Gate g : gates) { for (Gate g : gates) {
@ -268,9 +252,9 @@ public class GatesManager
int x = c.getX(); int x = c.getX();
int z = c.getZ(); int z = c.getZ();
for (int i = x-getChunkRadius(); i < x+getChunkRadius(); i++) { for (int i = x - getChunkRadius(); i < x + getChunkRadius(); i++) {
for (int j = z-getChunkRadius(); j < z+getChunkRadius(); j++) { for (int j = z - getChunkRadius(); j < z + getChunkRadius(); j++) {
chunksUsedByGates.add(new SimpleChunk(i, j, c.getWorld())); chunksUsedByGates.add(new SimpleChunk(i, j, c.getWorld()));
} }
@ -278,7 +262,7 @@ public class GatesManager
} }
} }
gatesByChunk = new HashMap<SimpleChunk, Set<Gate>>((int)(chunksUsedByGates.size() * 1.25)); gatesByChunk = new HashMap<SimpleChunk, Set<Gate>>((int) (chunksUsedByGates.size() * 1.25));
for (Gate g : gates) { for (Gate g : gates) {
this.addGateByChunk(g); this.addGateByChunk(g);
@ -286,8 +270,7 @@ public class GatesManager
} }
protected void fillGatesByLocation() protected void fillGatesByLocation() {
{
Set<Location> gateBlocks = new HashSet<Location>(); Set<Location> gateBlocks = new HashSet<Location>();
for (Gate g : gates) { for (Gate g : gates) {
@ -297,14 +280,14 @@ public class GatesManager
Location headLocation = new Location(l.getWorld(), Location headLocation = new Location(l.getWorld(),
l.getX(), l.getX(),
l.getY()+1, l.getY() + 1,
l.getZ()); l.getZ());
gateBlocks.add(headLocation); gateBlocks.add(headLocation);
} }
} }
gatesByLocation = new HashMap<SimpleLocation, Gate>((int)(gateBlocks.size()*1.25)); gatesByLocation = new HashMap<SimpleLocation, Gate>((int) (gateBlocks.size() * 1.25));
for (Gate g : gates) { for (Gate g : gates) {
this.addGateByLocations(g); this.addGateByLocations(g);
@ -312,15 +295,14 @@ public class GatesManager
} }
protected void fillGatesByFrameLocation() protected void fillGatesByFrameLocation() {
{
int numFrameBlocks = 0; int numFrameBlocks = 0;
for (Gate g : gates) { for (Gate g : gates) {
numFrameBlocks += g.gateFrameBlocks.size(); numFrameBlocks += g.gateFrameBlocks.size();
} }
gatesByFrameLocation = new HashMap<SimpleLocation, Gate>((int)(numFrameBlocks*1.25)); gatesByFrameLocation = new HashMap<SimpleLocation, Gate>((int) (numFrameBlocks * 1.25));
for (Gate g : gates) { for (Gate g : gates) {
this.addGateByFrameLocations(g); this.addGateByFrameLocations(g);
@ -328,20 +310,17 @@ public class GatesManager
} }
protected void removeGateById(final String id) protected void removeGateById(final String id) {
{
gatesById.remove(id); gatesById.remove(id);
} }
protected void addGateWithId(final Gate g) protected void addGateWithId(final Gate g) {
{
gatesById.put(g.getId(), g); gatesById.put(g.getId(), g);
} }
protected void removeGateByLocation(final Set<Location> gateBlocks) protected void removeGateByLocation(final Set<Location> gateBlocks) {
{
if (gateBlocks != null) { if (gateBlocks != null) {
for (Location l : gateBlocks) { for (Location l : gateBlocks) {
@ -356,8 +335,7 @@ public class GatesManager
} }
protected void removeGateByFrameLocation(final Set<Block> gateFrameBlocks) protected void removeGateByFrameLocation(final Set<Block> gateFrameBlocks) {
{
if (gateFrameBlocks != null) { if (gateFrameBlocks != null) {
for (Block block : gateFrameBlocks) { for (Block block : gateFrameBlocks) {
@ -368,8 +346,7 @@ public class GatesManager
} }
protected void addGateByLocations(final Gate g) protected void addGateByLocations(final Gate g) {
{
for (Location l : g.getGateBlockLocations()) { for (Location l : g.getGateBlockLocations()) {
SimpleLocation sl = new SimpleLocation(l); SimpleLocation sl = new SimpleLocation(l);
@ -381,8 +358,7 @@ public class GatesManager
} }
protected void addGateByFrameLocations(final Gate g) protected void addGateByFrameLocations(final Gate g) {
{
for (Block block : g.getGateFrameBlocks()) { for (Block block : g.getGateFrameBlocks()) {
SimpleLocation sl = new SimpleLocation(block.getLocation()); SimpleLocation sl = new SimpleLocation(block.getLocation());
gatesByFrameLocation.put(sl, g); gatesByFrameLocation.put(sl, g);
@ -390,17 +366,16 @@ public class GatesManager
} }
protected void removeGateFromChunk(final Gate g, final Location l) protected void removeGateFromChunk(final Gate g, final Location l) {
{
if (l != null) { if (l != null) {
Chunk c = l.getChunk(); Chunk c = l.getChunk();
int x = c.getX(); int x = c.getX();
int z = c.getZ(); int z = c.getZ();
for (int i = x-getChunkRadius(); i < x+getChunkRadius(); i++) { for (int i = x - getChunkRadius(); i < x + getChunkRadius(); i++) {
for (int j = z-getChunkRadius(); j < z+getChunkRadius(); j++) { for (int j = z - getChunkRadius(); j < z + getChunkRadius(); j++) {
SimpleChunk sc = new SimpleChunk(i, j, c.getWorld()); SimpleChunk sc = new SimpleChunk(i, j, c.getWorld());
Set<Gate> gatesInChunk = gatesByChunk.get(sc); Set<Gate> gatesInChunk = gatesByChunk.get(sc);
@ -415,8 +390,7 @@ public class GatesManager
} }
protected void addGateByChunk(final Gate g) protected void addGateByChunk(final Gate g) {
{
Location gateLocation = g.getLocation(); Location gateLocation = g.getLocation();
if (gateLocation != null) { if (gateLocation != null) {
@ -425,9 +399,9 @@ public class GatesManager
int x = c.getX(); int x = c.getX();
int z = c.getZ(); int z = c.getZ();
for (int i = x-getChunkRadius(); i < x+getChunkRadius(); i++) { for (int i = x - getChunkRadius(); i < x + getChunkRadius(); i++) {
for (int j = z-getChunkRadius(); j < z+getChunkRadius(); j++) { for (int j = z - getChunkRadius(); j < z + getChunkRadius(); j++) {
SimpleChunk sc = new SimpleChunk(i, j, c.getWorld()); SimpleChunk sc = new SimpleChunk(i, j, c.getWorld());
@ -445,8 +419,7 @@ public class GatesManager
} }
public void storeInvalidGate(Map<String, Object> map) public void storeInvalidGate(Map<String, Object> map) {
{
File invalidGatesFile = new File(Plugin.getPlugin().getDataFolder(), "invalid_gates.yml"); File invalidGatesFile = new File(Plugin.getPlugin().getDataFolder(), "invalid_gates.yml");
Boolean invalidGatesFileExists = invalidGatesFile.exists(); Boolean invalidGatesFileExists = invalidGatesFile.exists();
@ -477,7 +450,7 @@ public class GatesManager
fileWriter.write("\n"); fileWriter.write("\n");
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Map<String, Object> valueMap = (Map<String, Object>)value; Map<String, Object> valueMap = (Map<String, Object>) value;
for (String k : valueMap.keySet()) { for (String k : valueMap.keySet()) {
Object v = valueMap.get(k); Object v = valueMap.get(k);
@ -485,22 +458,19 @@ public class GatesManager
fileWriter.write("\t\t" + k + ": " + v.toString() + "\n"); fileWriter.write("\t\t" + k + ": " + v.toString() + "\n");
} }
} } else {
else {
fileWriter.write(value.toString() + "\n"); fileWriter.write(value.toString() + "\n");
} }
} }
fileWriter.close(); fileWriter.close();
} } catch (IOException e) {
catch (IOException e) {
Plugin.log("ERROR: Could not save invalid gates to disk. Reason: \n" + Arrays.toString(e.getStackTrace())); Plugin.log("ERROR: Could not save invalid gates to disk. Reason: \n" + Arrays.toString(e.getStackTrace()));
} }
} }
public void handleGateIdChange(final Gate g, final String oldId) public void handleGateIdChange(final Gate g, final String oldId) {
{
this.removeGateById(oldId); this.removeGateById(oldId);
this.addGateWithId(g); this.addGateWithId(g);
@ -516,8 +486,7 @@ public class GatesManager
public void handleGateLocationChange(final Gate g, public void handleGateLocationChange(final Gate g,
final Location oldLocation, final Location oldLocation,
final Set<Location> oldGateBlockLocations, final Set<Location> oldGateBlockLocations,
final Set<Block> oldGateFrameBlocks) final Set<Block> oldGateFrameBlocks) {
{
this.removeGateFromChunk(g, oldLocation); this.removeGateFromChunk(g, oldLocation);
this.addGateByChunk(g); this.addGateByChunk(g);
@ -536,8 +505,7 @@ public class GatesManager
} }
public void handleGateExitChange(final Gate g, final Location oldExit) public void handleGateExitChange(final Gate g, final Location oldExit) {
{
// nothing to do // nothing to do
Map<String, Object> changeSet = new HashMap<String, Object>(); Map<String, Object> changeSet = new HashMap<String, Object>();
@ -549,8 +517,7 @@ public class GatesManager
} }
public void handleNewGate(final Gate g) public void handleNewGate(final Gate g) {
{
this.gates.add(g); this.gates.add(g);
this.addGateByChunk(g); this.addGateByChunk(g);
@ -568,8 +535,7 @@ public class GatesManager
} }
public void handleDeletion(final Gate g) public void handleDeletion(final Gate g) {
{
this.gates.remove(g); this.gates.remove(g);
this.removeGateById(g.getId()); this.removeGateById(g.getId());
@ -586,14 +552,12 @@ public class GatesManager
} }
public boolean gateExists(final String id) public boolean gateExists(final String id) {
{
return gatesById.containsKey(id.toLowerCase()); return gatesById.containsKey(id.toLowerCase());
} }
public List<Gate> allGates () public List<Gate> allGates() {
{
return gates; return gates;
} }
} }

66
src/de/craftinc/gates/Plugin.java
View File

@ -38,8 +38,7 @@ import de.craftinc.gates.commands.*;
import org.mcstats.Metrics; import org.mcstats.Metrics;
public class Plugin extends JavaPlugin public class Plugin extends JavaPlugin {
{
public static final String permissionInfo = "craftincgates.info"; public static final String permissionInfo = "craftincgates.info";
public static final String permissionManage = "craftincgates.manage"; public static final String permissionManage = "craftincgates.manage";
public static final String permissionUse = "craftincgates.use"; public static final String permissionUse = "craftincgates.use";
@ -59,54 +58,45 @@ public class Plugin extends JavaPlugin
protected BlockBreakListener blockBreakListener = new BlockBreakListener(); protected BlockBreakListener blockBreakListener = new BlockBreakListener();
public Plugin() public Plugin() {
{
instance = this; instance = this;
} }
public static Plugin getPlugin() public static Plugin getPlugin() {
{
return instance; return instance;
} }
public GatesManager getGatesManager() public GatesManager getGatesManager() {
{
return gatesManager; return gatesManager;
} }
@Override @Override
public void onLoad() public void onLoad() {
{
ConfigurationSerialization.registerClass(Gate.class); ConfigurationSerialization.registerClass(Gate.class);
} }
protected void setupPermissions() protected void setupPermissions() {
{
if (getServer().getPluginManager().getPlugin("Vault") == null) { if (getServer().getPluginManager().getPlugin("Vault") == null) {
return; return;
} }
RegisteredServiceProvider<Permission> rsp = getServer().getServicesManager().getRegistration(Permission.class); RegisteredServiceProvider<Permission> rsp = getServer().getServicesManager().getRegistration(Permission.class);
if (rsp != null) if (rsp != null) {
{
log("Using permission provider provided by Vault."); log("Using permission provider provided by Vault.");
permission = rsp.getProvider(); permission = rsp.getProvider();
} } else {
else
{
log("Not using setup permission provider provided by Vault."); log("Not using setup permission provider provided by Vault.");
} }
} }
@Override @Override
public void onDisable() public void onDisable() {
{
// Save gates // Save gates
gatesManager.saveGatesToDisk(); gatesManager.saveGatesToDisk();
@ -115,14 +105,12 @@ public class Plugin extends JavaPlugin
@Override @Override
public void onEnable() public void onEnable() {
{
// Setup Metrics // Setup Metrics
try { try {
Metrics metrics = new Metrics(this); Metrics metrics = new Metrics(this);
metrics.start(); metrics.start();
} } catch (IOException e) {
catch (IOException e) {
log("Failed to start metrics!"); log("Failed to start metrics!");
} }
@ -159,16 +147,14 @@ public class Plugin extends JavaPlugin
if (success) { if (success) {
log("Enabled"); log("Enabled");
} } else {
else {
PluginManager pm = this.getServer().getPluginManager(); PluginManager pm = this.getServer().getPluginManager();
pm.disablePlugin(this); pm.disablePlugin(this);
} }
} }
protected void registerEventListeners() protected void registerEventListeners() {
{
PluginManager pm = this.getServer().getPluginManager(); PluginManager pm = this.getServer().getPluginManager();
pm.registerEvents(this.moveListener, this); pm.registerEvents(this.moveListener, this);
@ -187,8 +173,7 @@ public class Plugin extends JavaPlugin
// Commands // Commands
// -------------------------------------------- // // -------------------------------------------- //
public String getBaseCommand() public String getBaseCommand() {
{
if (this.baseCommand != null) if (this.baseCommand != null)
return this.baseCommand; return this.baseCommand;
@ -201,18 +186,15 @@ public class Plugin extends JavaPlugin
@Override @Override
public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
{
List<String> parameters = new ArrayList<String>(Arrays.asList(args)); List<String> parameters = new ArrayList<String>(Arrays.asList(args));
this.handleCommand(sender, parameters); this.handleCommand(sender, parameters);
return true; return true;
} }
public void handleCommand(CommandSender sender, List<String> parameters) public void handleCommand(CommandSender sender, List<String> parameters) {
{ if (parameters.size() == 0) {
if (parameters.size() == 0)
{
this.commands.get(0).execute(sender, parameters); this.commands.get(0).execute(sender, parameters);
return; return;
} }
@ -220,10 +202,8 @@ public class Plugin extends JavaPlugin
String commandName = parameters.get(0).toLowerCase(); String commandName = parameters.get(0).toLowerCase();
parameters.remove(0); parameters.remove(0);
for (BaseCommand fcommand : this.commands) for (BaseCommand fcommand : this.commands) {
{ if (fcommand.getAliases().contains(commandName)) {
if (fcommand.getAliases().contains(commandName))
{
fcommand.execute(sender, parameters); fcommand.execute(sender, parameters);
return; return;
} }
@ -237,15 +217,13 @@ public class Plugin extends JavaPlugin
/* /*
* Logging * Logging
*/ */
public static void log(String msg) public static void log(String msg) {
{
log(Level.INFO, msg); log(Level.INFO, msg);
} }
public static void log(Level level, String msg) public static void log(Level level, String msg) {
{ Logger.getLogger("Minecraft").log(level, "[" + instance.getDescription().getFullName() + "] " + msg);
Logger.getLogger("Minecraft").log(level, "["+instance.getDescription().getFullName()+"] "+msg);
} }

70
src/de/craftinc/gates/commands/BaseCommand.java
View File

@ -22,6 +22,7 @@ import java.util.List;
import de.craftinc.gates.util.ConfigurationUtil; import de.craftinc.gates.util.ConfigurationUtil;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import de.craftinc.gates.Gate; import de.craftinc.gates.Gate;
@ -29,8 +30,8 @@ import de.craftinc.gates.GatesManager;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
import de.craftinc.gates.util.TextUtil; import de.craftinc.gates.util.TextUtil;
public abstract class BaseCommand public abstract class BaseCommand {
{
protected List<String> aliases = new ArrayList<String>(); protected List<String> aliases = new ArrayList<String>();
protected List<String> requiredParameters = new ArrayList<String>(); protected List<String> requiredParameters = new ArrayList<String>();
protected List<String> optionalParameters = new ArrayList<String>(); protected List<String> optionalParameters = new ArrayList<String>();
@ -65,16 +66,21 @@ public abstract class BaseCommand
} }
if (this.senderMustBePlayer) { if (this.senderMustBePlayer) {
this.player = (Player)sender; this.player = (Player) sender;
} }
this.perform(); this.perform();
if (this.shouldPersistToDisk && Plugin.getPlugin().getConfig().getBoolean(ConfigurationUtil.confSaveOnChangesKey)) { if (this.shouldPersistToDisk && getSaveOnChanges()) {
Plugin.getPlugin().getGatesManager().saveGatesToDisk(); Plugin.getPlugin().getGatesManager().saveGatesToDisk();
} }
} }
private boolean getSaveOnChanges() {
FileConfiguration config = Plugin.getPlugin().getConfig();
return config.getBoolean(ConfigurationUtil.confSaveOnChangesKey);
}
abstract protected void perform(); abstract protected void perform();
@ -85,14 +91,13 @@ public abstract class BaseCommand
protected void sendMessage(List<String> messages) { protected void sendMessage(List<String> messages) {
for(String message : messages) { for (String message : messages) {
this.sendMessage(message); this.sendMessage(message);
} }
} }
protected boolean validateCall() protected boolean validateCall() {
{
boolean allParametersThere = parameters.size() >= requiredParameters.size(); boolean allParametersThere = parameters.size() >= requiredParameters.size();
boolean senderIsPlayer = this.sender instanceof Player; boolean senderIsPlayer = this.sender instanceof Player;
boolean hasGateParameter = false; boolean hasGateParameter = false;
@ -107,20 +112,17 @@ public abstract class BaseCommand
if (this.senderMustBePlayer && !senderIsPlayer) { if (this.senderMustBePlayer && !senderIsPlayer) {
sendMessage(ChatColor.RED + "This command can only be used by ingame players."); sendMessage(ChatColor.RED + "This command can only be used by ingame players.");
valid = false; valid = false;
} } else {
else {
if (!allParametersThere) { if (!allParametersThere) {
sendMessage(ChatColor.RED + "Some parameters are missing! " + ChatColor.AQUA + "Usage: " + this.getUsageTemplate(true)); sendMessage(ChatColor.RED + "Some parameters are missing! " + ChatColor.AQUA + "Usage: " + this.getUsageTemplate(true));
valid = false; valid = false;
} } else if ((!senderHasPermission && this.hasGateParam) ||
else if ((!senderHasPermission && this.hasGateParam) ||
(!senderHasPermission) || (!senderHasPermission) ||
(this.hasGateParam && !hasGateParameter)) { (this.hasGateParam && !hasGateParameter)) {
sendMessage(ChatColor.RED + "You either provided a invalid gate or do not have permission to " + this.helpDescription.toLowerCase()); sendMessage(ChatColor.RED + "You either provided a invalid gate or do not have permission to " + this.helpDescription.toLowerCase());
valid = false; valid = false;
} } else {
else {
valid = true; valid = true;
} }
} }
@ -129,14 +131,12 @@ public abstract class BaseCommand
} }
protected boolean setGateUsingParameter(String param) protected boolean setGateUsingParameter(String param) {
{
GatesManager gateManager = Plugin.getPlugin().getGatesManager(); GatesManager gateManager = Plugin.getPlugin().getGatesManager();
if (!gateManager.gateExists(param)) { if (!gateManager.gateExists(param)) {
return false; return false;
} } else {
else {
gate = gateManager.getGateWithId(param); gate = gateManager.getGateWithId(param);
return true; return true;
} }
@ -146,8 +146,7 @@ public abstract class BaseCommand
/** /**
* This will return false if a gate is required for this command but this.gate == null. * This will return false if a gate is required for this command but this.gate == null.
*/ */
protected boolean hasPermission() protected boolean hasPermission() {
{
if (Plugin.getPermission() == null) { // fallback - use the standard bukkit permission system if (Plugin.getPermission() == null) { // fallback - use the standard bukkit permission system
return this.sender.hasPermission(this.requiredPermission); return this.sender.hasPermission(this.requiredPermission);
} }
@ -165,24 +164,19 @@ public abstract class BaseCommand
if (this.hasGateParam) { if (this.hasGateParam) {
hasPermission = this.hasPermissionAtGateLocationAndExit(p); hasPermission = this.hasPermissionAtGateLocationAndExit(p);
} } else {
else {
hasPermission = Plugin.getPermission().has(p.getWorld(), p.getName(), this.requiredPermission); hasPermission = Plugin.getPermission().has(p.getWorld(), p.getName(), this.requiredPermission);
} }
} } else if (this.requiredPermission.equals(Plugin.permissionUse)) {
else if (this.requiredPermission.equals(Plugin.permissionUse) ) {
hasPermission = this.hasPermissionAtGateLocationAndExit(p); hasPermission = this.hasPermissionAtGateLocationAndExit(p);
} } else if (this.requiredPermission.equals(Plugin.permissionManage)) {
else if (this.requiredPermission.equals(Plugin.permissionManage)) {
if (this.needsPermissionAtCurrentLocation && this.hasGateParam) { if (this.needsPermissionAtCurrentLocation && this.hasGateParam) {
boolean hasPersmissionAtCurrentLocation = Plugin.getPermission().has(p.getWorld(), p.getName(), this.requiredPermission); boolean hasPersmissionAtCurrentLocation = Plugin.getPermission().has(p.getWorld(), p.getName(), this.requiredPermission);
hasPermission = hasPersmissionAtCurrentLocation && this.hasPermissionAtGateLocationAndExit(p); hasPermission = hasPersmissionAtCurrentLocation && this.hasPermissionAtGateLocationAndExit(p);
} } else if (this.needsPermissionAtCurrentLocation) {
else if (this.needsPermissionAtCurrentLocation) {
hasPermission = Plugin.getPermission().has(p.getWorld(), p.getName(), this.requiredPermission); hasPermission = Plugin.getPermission().has(p.getWorld(), p.getName(), this.requiredPermission);
} } else {
else {
hasPermission = this.hasPermissionAtGateLocationAndExit(p); hasPermission = this.hasPermissionAtGateLocationAndExit(p);
} }
} }
@ -191,9 +185,8 @@ public abstract class BaseCommand
} }
protected boolean hasPermissionAtGateLocationAndExit(Player p) protected boolean hasPermissionAtGateLocationAndExit(Player p) {
{ if (this.gate == null || p == null) {
if (this.gate == null || p == null) { // make sure we don't run into a nullpointer exception
return false; return false;
} }
@ -207,24 +200,23 @@ public abstract class BaseCommand
// -------------------------------------------- // // -------------------------------------------- //
// Help and usage description // Help and usage description
// -------------------------------------------- // // -------------------------------------------- //
protected String getUsageTemplate(boolean withColor, boolean withDescription) protected String getUsageTemplate(boolean withColor, boolean withDescription) {
{
String ret = ""; String ret = "";
if (withColor) { if (withColor) {
ret += ChatColor.AQUA; ret += ChatColor.AQUA;
} }
ret += "/" + Plugin.getPlugin().getBaseCommand() + " " + TextUtil.implode(this.getAliases(), ",")+" "; ret += "/" + Plugin.getPlugin().getBaseCommand() + " " + TextUtil.implode(this.getAliases(), ",") + " ";
List<String> parts = new ArrayList<String>(); List<String> parts = new ArrayList<String>();
for (String requiredParameter : this.requiredParameters) { for (String requiredParameter : this.requiredParameters) {
parts.add("["+requiredParameter+"]"); parts.add("[" + requiredParameter + "]");
} }
for (String optionalParameter : this.optionalParameters) { for (String optionalParameter : this.optionalParameters) {
parts.add("*["+optionalParameter+"]"); parts.add("*[" + optionalParameter + "]");
} }
if (withColor) { if (withColor) {
@ -239,14 +231,12 @@ public abstract class BaseCommand
if (withColor) { if (withColor) {
ret += ChatColor.YELLOW; ret += ChatColor.YELLOW;
} }
ret += this.helpDescription; ret += this.helpDescription;
} }
return ret; return ret;
} }
protected String getUsageTemplate(boolean withColor) protected String getUsageTemplate(boolean withColor) {
{
return getUsageTemplate(withColor, false); return getUsageTemplate(withColor, false);
} }
} }

10
src/de/craftinc/gates/commands/BaseLocationCommand.java
View File

@ -21,10 +21,9 @@ import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
public abstract class BaseLocationCommand extends BaseCommand public abstract class BaseLocationCommand extends BaseCommand {
{
protected Location getValidPlayerLocation() protected Location getValidPlayerLocation() {
{
// The player might stand in a half block or a sign or whatever // The player might stand in a half block or a sign or whatever
// Therefore we load some extra locations and blocks // Therefore we load some extra locations and blocks
Block playerBlock = player.getLocation().getBlock(); Block playerBlock = player.getLocation().getBlock();
@ -32,8 +31,7 @@ public abstract class BaseLocationCommand extends BaseCommand
if (playerBlock.getType() == Material.AIR) { if (playerBlock.getType() == Material.AIR) {
return player.getLocation(); return player.getLocation();
} } else if (upBlock.getType() == Material.AIR) {
else if (upBlock.getType() == Material.AIR) {
return new Location(player.getLocation().getWorld(), return new Location(player.getLocation().getWorld(),
player.getLocation().getX(), player.getLocation().getX(),
player.getLocation().getY() + 1, player.getLocation().getY() + 1,

12
src/de/craftinc/gates/commands/CommandAllowRiding.java
View File

@ -20,19 +20,16 @@ package de.craftinc.gates.commands;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
public class CommandAllowRiding extends BaseCommand public class CommandAllowRiding extends BaseCommand {
{
public CommandAllowRiding() public CommandAllowRiding() {
{
aliases.add("allowRiding"); aliases.add("allowRiding");
aliases.add("ar"); aliases.add("ar");
requiredParameters.add("id"); requiredParameters.add("id");
helpDescription = "Allow players to travel while riding."; helpDescription = "Allow players to travel while riding.";
requiredPermission = Plugin.permissionManage; requiredPermission = Plugin.permissionManage;
needsPermissionAtCurrentLocation = false; needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true; shouldPersistToDisk = true;
@ -40,8 +37,7 @@ public class CommandAllowRiding extends BaseCommand
} }
@Override @Override
protected void perform() protected void perform() {
{
gate.setAllowsVehicles(true); gate.setAllowsVehicles(true);
sendMessage(ChatColor.GREEN + "Traveling while riding is now enabled for this gate."); sendMessage(ChatColor.GREEN + "Traveling while riding is now enabled for this gate.");
} }

23
src/de/craftinc/gates/commands/CommandClose.java
View File

@ -24,41 +24,30 @@ import org.bukkit.ChatColor;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
public class CommandClose extends BaseCommand public class CommandClose extends BaseCommand {
{
public CommandClose() public CommandClose() {
{
aliases.add("close"); aliases.add("close");
aliases.add("c"); aliases.add("c");
requiredParameters.add("id"); requiredParameters.add("id");
helpDescription = "Closes a gate to prevent players from using it."; helpDescription = "Closes a gate to prevent players from using it.";
requiredPermission = Plugin.permissionManage; requiredPermission = Plugin.permissionManage;
needsPermissionAtCurrentLocation = false; needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true; shouldPersistToDisk = true;
senderMustBePlayer = false; senderMustBePlayer = false;
} }
@Override @Override
public void perform() public void perform() {
{ try {
try
{
gate.setOpen(false); gate.setOpen(false);
GateBlockChangeSender.updateGateBlocks(gate); GateBlockChangeSender.updateGateBlocks(gate);
sendMessage(ChatColor.GREEN + "The gate was closed."); sendMessage(ChatColor.GREEN + "The gate was closed.");
} } catch (Exception e) {
catch(Exception e)
{
sendMessage(ChatColor.RED + "Opening the gate failed! See server log for more information"); sendMessage(ChatColor.RED + "Opening the gate failed! See server log for more information");
Plugin.log(Level.WARNING, e.getMessage()); Plugin.log(Level.WARNING, e.getMessage());
e.printStackTrace(); e.printStackTrace();
} }
} }
} }

14
src/de/craftinc/gates/commands/CommandDenyRiding.java
View File

@ -19,28 +19,22 @@ package de.craftinc.gates.commands;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
public class CommandDenyRiding extends BaseCommand public class CommandDenyRiding extends BaseCommand {
{
public CommandDenyRiding() public CommandDenyRiding() {
{
aliases.add("denyRiding"); aliases.add("denyRiding");
aliases.add("dr"); aliases.add("dr");
requiredParameters.add("id"); requiredParameters.add("id");
helpDescription = "Deny players to travel while riding."; helpDescription = "Deny players to travel while riding.";
requiredPermission = Plugin.permissionManage; requiredPermission = Plugin.permissionManage;
needsPermissionAtCurrentLocation = false; needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true; shouldPersistToDisk = true;
senderMustBePlayer = false; senderMustBePlayer = false;
} }
@Override @Override
protected void perform() protected void perform() {
{
gate.setAllowsVehicles(false); gate.setAllowsVehicles(false);
sendMessage(ChatColor.GREEN + "Traveling while riding is now disabled for this gate."); sendMessage(ChatColor.GREEN + "Traveling while riding is now disabled for this gate.");
} }

16
src/de/craftinc/gates/commands/CommandExit.java
View File

@ -24,11 +24,9 @@ import org.bukkit.ChatColor;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
import org.bukkit.Location; import org.bukkit.Location;
public class CommandExit extends BaseCommand {
public class CommandExit extends BaseCommand public CommandExit() {
{
public CommandExit()
{
aliases.add("exit"); aliases.add("exit");
aliases.add("e"); aliases.add("e");
@ -44,16 +42,13 @@ public class CommandExit extends BaseCommand
} }
public void perform() public void perform() {
{ try {
try
{
Location oldExit = gate.getExit(); Location oldExit = gate.getExit();
gate.setExit(player.getLocation()); gate.setExit(player.getLocation());
sendMessage(ChatColor.GREEN + "The exit of gate '" + gate.getId() + "' is now where you stand."); sendMessage(ChatColor.GREEN + "The exit of gate '" + gate.getId() + "' is now where you stand.");
Plugin.getPlugin().getGatesManager().handleGateExitChange(gate, oldExit); Plugin.getPlugin().getGatesManager().handleGateExitChange(gate, oldExit);
} } catch (Exception e) {
catch (Exception e) {
GateBlockChangeSender.updateGateBlocks(gate); GateBlockChangeSender.updateGateBlocks(gate);
sendMessage(ChatColor.RED + "Setting the exit for the gate failed! See server log for more information"); sendMessage(ChatColor.RED + "Setting the exit for the gate failed! See server log for more information");
Plugin.log(Level.WARNING, e.getMessage()); Plugin.log(Level.WARNING, e.getMessage());
@ -61,4 +56,3 @@ public class CommandExit extends BaseCommand
} }
} }
} }

22
src/de/craftinc/gates/commands/CommandExitOpen.java
View File

@ -24,29 +24,23 @@ import org.bukkit.Location;
import java.util.logging.Level; import java.util.logging.Level;
public class CommandExitOpen extends BaseCommand public class CommandExitOpen extends BaseCommand {
{
public CommandExitOpen() public CommandExitOpen() {
{
aliases.add("exitopen"); aliases.add("exitopen");
aliases.add("eo"); aliases.add("eo");
requiredParameters.add("id"); requiredParameters.add("id");
helpDescription = "Change exit of location and open that gate afterwards."; helpDescription = "Change exit of location and open that gate afterwards.";
requiredPermission = Plugin.permissionManage; requiredPermission = Plugin.permissionManage;
needsPermissionAtCurrentLocation = true; needsPermissionAtCurrentLocation = true;
shouldPersistToDisk = true; shouldPersistToDisk = true;
senderMustBePlayer = true; senderMustBePlayer = true;
} }
public void perform() public void perform() {
{ try {
try
{
Location oldExit = gate.getExit(); Location oldExit = gate.getExit();
gate.setExit(player.getLocation()); gate.setExit(player.getLocation());
sendMessage(ChatColor.GREEN + "The exit of gate '" + gate.getId() + "' is now where you stand."); sendMessage(ChatColor.GREEN + "The exit of gate '" + gate.getId() + "' is now where you stand.");
@ -68,12 +62,10 @@ public class CommandExitOpen extends BaseCommand
} }
sendMessage(ChatColor.GREEN + "The gate was opened."); sendMessage(ChatColor.GREEN + "The gate was opened.");
} } catch (Exception e) {
catch (Exception e) {
sendMessage(ChatColor.RED + e.getMessage()); sendMessage(ChatColor.RED + e.getMessage());
} }
} } catch (Exception e) {
catch (Exception e) {
GateBlockChangeSender.updateGateBlocks(gate); GateBlockChangeSender.updateGateBlocks(gate);
sendMessage(ChatColor.RED + "Setting the exit for the gate failed! This gate is now closed! (See server log for more information.)"); sendMessage(ChatColor.RED + "Setting the exit for the gate failed! This gate is now closed! (See server log for more information.)");
Plugin.log(Level.WARNING, e.getMessage()); Plugin.log(Level.WARNING, e.getMessage());

47
src/de/craftinc/gates/commands/CommandHelp.java
View File

@ -23,29 +23,28 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
public class CommandHelp extends BaseCommand public class CommandHelp extends BaseCommand {
{
public static List<List<String>> helpPages; public static List<List<String>> helpPages;
static static {
{
// sort the usage strings // sort the usage strings
List<String> allUsageStrings = new ArrayList<String>(); List<String> allUsageStrings = new ArrayList<String>();
allUsageStrings.add( new CommandHelp().getUsageTemplate(true, true) ); allUsageStrings.add(new CommandHelp().getUsageTemplate(true, true));
allUsageStrings.add( new CommandNew().getUsageTemplate(true, true) ); allUsageStrings.add(new CommandNew().getUsageTemplate(true, true));
allUsageStrings.add( new CommandRemove().getUsageTemplate(true, true) ); allUsageStrings.add(new CommandRemove().getUsageTemplate(true, true));
allUsageStrings.add( new CommandLocation().getUsageTemplate(true, true) ); allUsageStrings.add(new CommandLocation().getUsageTemplate(true, true));
allUsageStrings.add( new CommandExit().getUsageTemplate(true, true) ); allUsageStrings.add(new CommandExit().getUsageTemplate(true, true));
allUsageStrings.add( new CommandOpen().getUsageTemplate(true, true) ); allUsageStrings.add(new CommandOpen().getUsageTemplate(true, true));
allUsageStrings.add( new CommandRename().getUsageTemplate(true, true) ); allUsageStrings.add(new CommandRename().getUsageTemplate(true, true));
allUsageStrings.add( new CommandClose().getUsageTemplate(true, true) ); allUsageStrings.add(new CommandClose().getUsageTemplate(true, true));
allUsageStrings.add( new CommandList().getUsageTemplate(true, true) ); allUsageStrings.add(new CommandList().getUsageTemplate(true, true));
allUsageStrings.add( new CommandInfo().getUsageTemplate(true, true) ); allUsageStrings.add(new CommandInfo().getUsageTemplate(true, true));
allUsageStrings.add( new CommandHide().getUsageTemplate(true, true) ); allUsageStrings.add(new CommandHide().getUsageTemplate(true, true));
allUsageStrings.add( new CommandUnhide().getUsageTemplate(true, true) ); allUsageStrings.add(new CommandUnhide().getUsageTemplate(true, true));
allUsageStrings.add( new CommandExitOpen().getUsageTemplate(true, true) ); allUsageStrings.add(new CommandExitOpen().getUsageTemplate(true, true));
allUsageStrings.add( new CommandNearby().getUsageTemplate(true, true) ); allUsageStrings.add(new CommandNearby().getUsageTemplate(true, true));
Collections.sort(allUsageStrings); Collections.sort(allUsageStrings);
@ -63,8 +62,7 @@ public class CommandHelp extends BaseCommand
} }
public CommandHelp() public CommandHelp() {
{
aliases.add("help"); aliases.add("help");
aliases.add("?"); aliases.add("?");
@ -80,20 +78,17 @@ public class CommandHelp extends BaseCommand
} }
public void perform() public void perform() {
{
int page; int page;
if (parameters.size() > 0) { if (parameters.size() > 0) {
try { try {
page = Integer.parseInt(parameters.get(0)); page = Integer.parseInt(parameters.get(0));
} } catch (NumberFormatException e) {
catch (NumberFormatException e) {
// wasn't an integer // wasn't an integer
page = 1; page = 1;
} }
} } else {
else {
page = 1; page = 1;
} }

13
src/de/craftinc/gates/commands/CommandHide.java
View File

@ -24,10 +24,9 @@ import org.bukkit.ChatColor;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
public class CommandHide extends BaseCommand public class CommandHide extends BaseCommand {
{
public CommandHide() public CommandHide() {
{
aliases.add("hide"); aliases.add("hide");
aliases.add("h"); aliases.add("h");
@ -43,14 +42,12 @@ public class CommandHide extends BaseCommand
} }
public void perform() public void perform() {
{
try { try {
gate.setHidden(true); gate.setHidden(true);
GateBlockChangeSender.updateGateBlocks(gate); GateBlockChangeSender.updateGateBlocks(gate);
sendMessage(ChatColor.GREEN + "The gate '" + gate.getId() + "' is now hidden."); sendMessage(ChatColor.GREEN + "The gate '" + gate.getId() + "' is now hidden.");
} } catch (Exception e) {
catch (Exception e) {
sendMessage(ChatColor.RED + "Hiding the gate failed! See server log for more information"); sendMessage(ChatColor.RED + "Hiding the gate failed! See server log for more information");
Plugin.log(Level.WARNING, e.getMessage()); Plugin.log(Level.WARNING, e.getMessage());
e.printStackTrace(); e.printStackTrace();

27
src/de/craftinc/gates/commands/CommandInfo.java
View File

@ -16,7 +16,6 @@
*/ */
package de.craftinc.gates.commands; package de.craftinc.gates.commands;
import de.craftinc.gates.util.GateBlockChangeSender; import de.craftinc.gates.util.GateBlockChangeSender;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -24,11 +23,9 @@ import de.craftinc.gates.Plugin;
import de.craftinc.gates.util.TextUtil; import de.craftinc.gates.util.TextUtil;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class CommandInfo extends BaseCommand {
public class CommandInfo extends BaseCommand public CommandInfo() {
{
public CommandInfo()
{
aliases.add("info"); aliases.add("info");
aliases.add("i"); aliases.add("i");
@ -45,8 +42,7 @@ public class CommandInfo extends BaseCommand
} }
public void perform() public void perform() {
{
if (this.parameters.size() > 0) { if (this.parameters.size() > 0) {
if (!this.setGateUsingParameter(this.parameters.get(0))) { if (!this.setGateUsingParameter(this.parameters.get(0))) {
@ -55,8 +51,7 @@ public class CommandInfo extends BaseCommand
} }
sendMessage(TextUtil.titleize("Information about: '" + ChatColor.WHITE + gate.getId() + ChatColor.YELLOW + "'")); sendMessage(TextUtil.titleize("Information about: '" + ChatColor.WHITE + gate.getId() + ChatColor.YELLOW + "'"));
} } else {
else {
boolean senderIsPlayer = this.sender instanceof Player; boolean senderIsPlayer = this.sender instanceof Player;
if (!senderIsPlayer) { if (!senderIsPlayer) {
@ -64,7 +59,7 @@ public class CommandInfo extends BaseCommand
return; return;
} }
Player p = (Player)this.sender; Player p = (Player) this.sender;
this.gate = Plugin.getPlugin().getGatesManager().getNearestGate(p.getLocation()); this.gate = Plugin.getPlugin().getGatesManager().getNearestGate(p.getLocation());
if (!this.hasPermission() || this.gate == null) { if (!this.hasPermission() || this.gate == null) {
@ -85,22 +80,22 @@ public class CommandInfo extends BaseCommand
openHiddenMessage += ChatColor.AQUA + " closed"; openHiddenMessage += ChatColor.AQUA + " closed";
if (gate.isHidden()) if (gate.isHidden())
openHiddenMessage += ChatColor.DARK_AQUA +" and" + ChatColor.AQUA + " hidden"; openHiddenMessage += ChatColor.DARK_AQUA + " and" + ChatColor.AQUA + " hidden";
openHiddenMessage += ".\n"; openHiddenMessage += ".\n";
sendMessage(openHiddenMessage); sendMessage(openHiddenMessage);
if (gate.getLocation() != null) if (gate.getLocation() != null)
sendMessage(ChatColor.DARK_AQUA + "location: " + ChatColor.AQUA + "( " + (int)gate.getLocation().getX() + sendMessage(ChatColor.DARK_AQUA + "location: " + ChatColor.AQUA + "( " + (int) gate.getLocation().getX() +
" | " + (int)gate.getLocation().getY() + " | " + (int)gate.getLocation().getZ() + " ) in " + " | " + (int) gate.getLocation().getY() + " | " + (int) gate.getLocation().getZ() + " ) in " +
gate.getLocation().getWorld().getName()); gate.getLocation().getWorld().getName());
else else
sendMessage(ChatColor.DARK_AQUA + "NOTE: this gate has no location"); sendMessage(ChatColor.DARK_AQUA + "NOTE: this gate has no location");
if (gate.getExit() != null) if (gate.getExit() != null)
sendMessage(ChatColor.DARK_AQUA + "exit: " + ChatColor.AQUA + "( " + (int)gate.getExit().getX() + " | " sendMessage(ChatColor.DARK_AQUA + "exit: " + ChatColor.AQUA + "( " + (int) gate.getExit().getX() + " | "
+ (int)gate.getExit().getY() + " | " + (int)gate.getExit().getZ() + " ) in " + + (int) gate.getExit().getY() + " | " + (int) gate.getExit().getZ() + " ) in " +
gate.getExit().getWorld().getName()); gate.getExit().getWorld().getName());
else else
sendMessage(ChatColor.DARK_AQUA + "NOTE: this gate has no exit"); sendMessage(ChatColor.DARK_AQUA + "NOTE: this gate has no exit");
@ -111,7 +106,7 @@ public class CommandInfo extends BaseCommand
if (this.sender instanceof Player) { if (this.sender instanceof Player) {
GateBlockChangeSender.temporaryHighlightGateFrame((Player)this.sender, this.gate); GateBlockChangeSender.temporaryHighlightGateFrame((Player) this.sender, this.gate);
} }
} }
} }

531
src/de/craftinc/gates/commands/CommandList.java
View File

@ -28,20 +28,17 @@ import de.craftinc.gates.Gate;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
import de.craftinc.gates.util.TextUtil; import de.craftinc.gates.util.TextUtil;
public class CommandList extends BaseCommand {
public class CommandList extends BaseCommand private static final int linesPerPage = 10;
{
protected static final int linesPerPage = 10; /* this is actually not true. the font used by Minecraft is not
protected static final int charactersPerLine = 52; /* this is actually no true. the monospaced. but there seems to be no (easy) way to calculate
font used by minecraft is not
monospace. but I don't think
there is a (easy) way for a
bukkit plugin to calculate
the drawing-size of a string. the drawing-size of a string.
*/ */
private static final int charactersPerLine = 52;
public CommandList() public CommandList() {
{
aliases.add("list"); aliases.add("list");
aliases.add("ls"); aliases.add("ls");
@ -56,278 +53,7 @@ public class CommandList extends BaseCommand
senderMustBePlayer = false; senderMustBePlayer = false;
} }
public void perform() {
protected static List<String> linesOfGateIds(List<String> gates)
{
List<String> lines = new ArrayList<String>();
int index = 0;
List<String> gateIdsForCurrentLine = new ArrayList<String>();
int numCharactersInCurrentLine = 0;
while (index < gates.size()) {
String gateId = gates.get(index);
int gateIdLength = gateId.length() + 2; // actual length + comma + whitespace
// special case: very long gate id
if (gateIdLength > charactersPerLine && numCharactersInCurrentLine == 0) {
gateIdsForCurrentLine = new ArrayList<String>();
numCharactersInCurrentLine = 0;
while ((gateId.length() + 2) > charactersPerLine) {
int cutPos = charactersPerLine;
// is the id too long to add comma and whitespace but not longer than the line?
if (gateId.length() <= charactersPerLine) {
cutPos -= 2;
}
lines.add(gateId.substring(0, cutPos));
gateId = gateId.substring(cutPos, gateId.length());
}
gateIdsForCurrentLine.add(gateId);
numCharactersInCurrentLine += gateId.length();
index++;
}
// gate fits into current line
else if ((numCharactersInCurrentLine + gateIdLength) <= charactersPerLine) {
gateIdsForCurrentLine.add(gateId);
numCharactersInCurrentLine += gateIdLength;
index++;
}
// the current gate does not fit on the
else {
lines.add(TextUtil.implode(gateIdsForCurrentLine, ", ") + ", ");
gateIdsForCurrentLine = new ArrayList<String>();
numCharactersInCurrentLine = 0;
}
}
lines.add(TextUtil.implode(gateIdsForCurrentLine, ", "));
return lines;
}
protected static String intToTitleString(int i, boolean addPreviousPageNote, boolean addNextPageNote)
{
String retVal = ChatColor.DARK_AQUA + "";
if ( i < 26 ) {
retVal += (char)(i+65);
}
else if ( i == 26 ) {
retVal += "0-9";
}
else {
retVal += "!@#$";
}
if (addPreviousPageNote && addNextPageNote) {
retVal += " (more on previous and next page)";
}
else if (addPreviousPageNote) {
retVal += " (more on previous page)";
}
else if (addNextPageNote) {
retVal += " (more on next page)";
}
return retVal + "\n";
}
/**
* Method for getting a collection of gates the player is allowed to see.
*/
protected Collection<Gate> getAllGates()
{
Collection<Gate> gates = Plugin.getPlugin().getGatesManager().allGates();
if (this.sender instanceof Player && Plugin.getPermission() != null) {
Player p = (Player)this.sender;
// create a copy since we cannot iterate over a collection while modifying it!
Collection<Gate> gatesCopy = new ArrayList<Gate>(gates);
for (Gate gate : gatesCopy) {
if (gate.getLocation() != null) {
boolean permissionAtGateLocation = Plugin.getPermission().has(gate.getLocation().getWorld(), p.getName(), this.requiredPermission);
if (!permissionAtGateLocation) {
gates.remove(gate);
continue;
}
}
if (gate.getExit() != null) {
boolean permissionAtGateExit = Plugin.getPermission().has(gate.getExit().getWorld(), p.getName(), this.requiredPermission);
if (!permissionAtGateExit) {
gates.remove(gate);
}
}
}
}
return gates;
}
/**
* Sorts all gates by there first character.
* Puts gates in corresponding Lists: (all returned lists will be sorted alphabetically)
* list 0-25: a,b,c,..,z
* list 26: 0-9
* list 27: other
*/
protected static List<List<String>> gatesSortedByName(Collection<Gate> allGates)
{
// create the lists
List<List<String>> ids = new ArrayList<List<String>>();
for (int i=0; i<28; i++) {
ids.add(new ArrayList<String>());
}
// put all gates into correct lists
for (Gate gate : allGates) {
String id = gate.getId();
int first = id.charAt(0);
if (first > 96 && first < 123) { // convert lower case chars
first -= 97;
}
else if (first > 64 && first < 91) { // convert upper case chars
first -= 65;
}
else if (first > 47 && first < 58) { // convert numbers
first = 26;
}
else { // everything else
first = 27;
}
ids.get(first).add(id);
}
// sort everything
for (int i=0; i<28; i++) {
Collections.sort(ids.get(i));
}
return ids;
}
/**
* Returns a list of strings.
* Each string is the text for a page.
* The maximum number of lines per page is 'linesPerPage' minus 1.
* Will return an empty list if no gates are availible.
*/
protected List<String> pagedGateIds()
{
Collection<Gate> gates = this.getAllGates();
if (gates.size() == 0) {
return null;
}
List<List<String>> gatesSortedByName = gatesSortedByName(gates);
List<String> allPages = new ArrayList<String>();
int linesLeftOnPage = linesPerPage - 1;
String currentPageString = "";
for (int i=0; i<gatesSortedByName.size(); i++) {
List<String> currentGates = gatesSortedByName.get(i);
if(currentGates.isEmpty()) {
continue;
}
List<String> currentGatesAsLines = linesOfGateIds(currentGates);
boolean moreGatesOnLastPage = false;
while (!currentGatesAsLines.isEmpty()) {
if (linesLeftOnPage < 2) {
currentPageString = currentPageString.substring(0, currentPageString.length()-2); // remove newlines add the end of the page
allPages.add(currentPageString);
currentPageString = "";
linesLeftOnPage = linesPerPage - 1;
}
// calculate number of lines to add to current page
int linesNecessaryForCurrentGates = currentGatesAsLines.size();
int linesToFill;
boolean moreGatesOnNextPage;
if (linesNecessaryForCurrentGates < linesLeftOnPage) {
linesToFill = linesNecessaryForCurrentGates;
moreGatesOnNextPage = false;
}
else {
linesToFill = linesLeftOnPage -1;
moreGatesOnNextPage = true;
}
// add title
currentPageString += intToTitleString(i, moreGatesOnLastPage, moreGatesOnNextPage);
currentPageString += ChatColor.AQUA;
linesLeftOnPage--;
// add gate lines
for (int j=0; j<linesToFill; j++) {
currentPageString += currentGatesAsLines.get(j) + "\n";
}
// remove lines added
for (int j=0; j<linesToFill; j++) {
currentGatesAsLines.remove(0);
}
// cleanup
moreGatesOnLastPage = linesNecessaryForCurrentGates >= linesLeftOnPage;
linesLeftOnPage -= linesToFill;
}
}
// add the last page
if (!currentPageString.isEmpty()) {
currentPageString = currentPageString.substring(0, currentPageString.length()-2); // remove newlines add the end of the page
allPages.add(currentPageString);
}
return allPages;
}
protected int getPageParameter()
{
int page = 1;
try {
page = new Integer(parameters.get(0));
}
catch (Exception ignored) { }
return page;
}
public void perform()
{
int page = this.getPageParameter(); int page = this.getPageParameter();
List<String> allPages = this.pagedGateIds(); List<String> allPages = this.pagedGateIds();
@ -343,9 +69,246 @@ public class CommandList extends BaseCommand
} }
String message = TextUtil.titleize("List of all gates (" + page + "/" + allPages.size() + ")") + "\n"; String message = TextUtil.titleize("List of all gates (" + page + "/" + allPages.size() + ")") + "\n";
message += allPages.get(page-1); message += allPages.get(page - 1);
sendMessage(message); sendMessage(message);
} }
}
private static List<String> linesOfGateIds(List<String> gates) {
List<String> lines = new ArrayList<String>();
int index = 0;
List<String> gateIdsForCurrentLine = new ArrayList<String>();
int numCharactersInCurrentLine = 0;
while (index < gates.size()) {
String gateId = gates.get(index);
int gateIdLength = gateId.length() + 2; // actual length + comma + whitespace
if (gateIdLength > charactersPerLine && numCharactersInCurrentLine == 0) { // special case: very long gate id
gateIdsForCurrentLine = new ArrayList<String>();
numCharactersInCurrentLine = 0;
while ((gateId.length() + 2) > charactersPerLine) {
int cutPos = charactersPerLine;
// is the id too long to add comma and whitespace but not longer than the line?
if (gateId.length() <= charactersPerLine) {
cutPos -= 2;
}
lines.add(gateId.substring(0, cutPos));
gateId = gateId.substring(cutPos, gateId.length());
}
gateIdsForCurrentLine.add(gateId);
numCharactersInCurrentLine += gateId.length();
index++;
} else if ((numCharactersInCurrentLine + gateIdLength) <= charactersPerLine) { // gate fits into current line
gateIdsForCurrentLine.add(gateId);
numCharactersInCurrentLine += gateIdLength;
index++;
} else { // the current gate does not fit on the
lines.add(TextUtil.implode(gateIdsForCurrentLine, ", ") + ", ");
gateIdsForCurrentLine = new ArrayList<String>();
numCharactersInCurrentLine = 0;
}
}
lines.add(TextUtil.implode(gateIdsForCurrentLine, ", "));
return lines;
}
private static String intToTitleString(int i, boolean addPreviousPageNote, boolean addNextPageNote) {
String retVal = ChatColor.DARK_AQUA + "";
if (i < 26) {
retVal += (char) (i + 65);
} else if (i == 26) {
retVal += "0-9";
} else {
retVal += "!@#$";
}
if (addPreviousPageNote && addNextPageNote) {
retVal += " (more on previous and next page)";
} else if (addPreviousPageNote) {
retVal += " (more on previous page)";
} else if (addNextPageNote) {
retVal += " (more on next page)";
}
return retVal + "\n";
}
/**
* Method for getting a collection of gates the player is allowed to see.
*/
private Collection<Gate> getAllGates() {
Collection<Gate> gates = Plugin.getPlugin().getGatesManager().allGates();
if (this.sender instanceof Player && Plugin.getPermission() != null) {
Player p = (Player) this.sender;
// create a copy since we cannot iterate over a collection while modifying it!
Collection<Gate> gatesCopy = new ArrayList<Gate>(gates);
for (Gate gate : gatesCopy) {
if (gate.getLocation() != null) {
boolean permissionAtGateLocation = Plugin.getPermission().has(gate.getLocation().getWorld(), p.getName(), this.requiredPermission);
if (!permissionAtGateLocation) {
gates.remove(gate);
continue;
}
}
if (gate.getExit() != null) {
boolean permissionAtGateExit = Plugin.getPermission().has(gate.getExit().getWorld(), p.getName(), this.requiredPermission);
if (!permissionAtGateExit) {
gates.remove(gate);
}
}
}
}
return gates;
}
/**
* Sorts all gates by there first character.
* Puts gates in corresponding Lists: (all returned lists will be sorted alphabetically)
* list 0-25: a,b,c,..,z
* list 26: 0-9
* list 27: other
*/
private static List<List<String>> gatesSortedByName(Collection<Gate> allGates) {
// create the lists
List<List<String>> ids = new ArrayList<List<String>>();
for (int i = 0; i < 28; i++) {
ids.add(new ArrayList<String>());
}
// put all gates into correct lists
for (Gate gate : allGates) {
String id = gate.getId();
int first = id.charAt(0);
if (first > 96 && first < 123) { // convert lower case chars
first -= 97;
} else if (first > 64 && first < 91) { // convert upper case chars
first -= 65;
} else if (first > 47 && first < 58) { // convert numbers
first = 26;
} else { // everything else
first = 27;
}
ids.get(first).add(id);
}
// sort everything
for (int i = 0; i < 28; i++) {
Collections.sort(ids.get(i));
}
return ids;
}
/**
* Returns a list of strings.
* Each string is the text for a page.
* The maximum number of lines per page is 'linesPerPage' minus 1.
* Will return an empty list if no gates are availible.
*/
private List<String> pagedGateIds() {
Collection<Gate> gates = this.getAllGates();
if (gates.size() == 0) {
return null;
}
List<List<String>> gatesSortedByName = gatesSortedByName(gates);
List<String> allPages = new ArrayList<String>();
int linesLeftOnPage = linesPerPage - 1;
String currentPageString = "";
for (int i = 0; i < gatesSortedByName.size(); i++) {
List<String> currentGates = gatesSortedByName.get(i);
if (currentGates.isEmpty()) {
continue;
}
List<String> currentGatesAsLines = linesOfGateIds(currentGates);
boolean moreGatesOnLastPage = false;
while (!currentGatesAsLines.isEmpty()) {
if (linesLeftOnPage < 2) {
currentPageString = currentPageString.substring(0, currentPageString.length() - 2); // remove newlines add the end of the page
allPages.add(currentPageString);
currentPageString = "";
linesLeftOnPage = linesPerPage - 1;
}
// calculate number of lines to add to current page
int linesNecessaryForCurrentGates = currentGatesAsLines.size();
int linesToFill;
boolean moreGatesOnNextPage;
if (linesNecessaryForCurrentGates < linesLeftOnPage) {
linesToFill = linesNecessaryForCurrentGates;
moreGatesOnNextPage = false;
} else {
linesToFill = linesLeftOnPage - 1;
moreGatesOnNextPage = true;
}
// add title
currentPageString += intToTitleString(i, moreGatesOnLastPage, moreGatesOnNextPage);
currentPageString += ChatColor.AQUA;
linesLeftOnPage--;
// add gate lines
for (int j = 0; j < linesToFill; j++) {
currentPageString += currentGatesAsLines.get(j) + "\n";
}
// remove lines added
for (int j = 0; j < linesToFill; j++) {
currentGatesAsLines.remove(0);
}
// cleanup
moreGatesOnLastPage = linesNecessaryForCurrentGates >= linesLeftOnPage;
linesLeftOnPage -= linesToFill;
}
}
// add the last page
if (!currentPageString.isEmpty()) {
currentPageString = currentPageString.substring(0, currentPageString.length() - 2); // remove newlines add the end of the page
allPages.add(currentPageString);
}
return allPages;
}
private int getPageParameter() {
int page = 1;
try {
page = new Integer(parameters.get(0));
} catch (Exception ignored) {
}
return page;
}
}

28
src/de/craftinc/gates/commands/CommandLocation.java
View File

@ -16,7 +16,6 @@
*/ */
package de.craftinc.gates.commands; package de.craftinc.gates.commands;
import java.util.Set; import java.util.Set;
import de.craftinc.gates.util.GateBlockChangeSender; import de.craftinc.gates.util.GateBlockChangeSender;
@ -26,18 +25,14 @@ import org.bukkit.Location;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
import org.bukkit.block.Block; import org.bukkit.block.Block;
public class CommandLocation extends BaseLocationCommand {
public class CommandLocation extends BaseLocationCommand public CommandLocation() {
{
public CommandLocation()
{
aliases.add("location"); aliases.add("location");
aliases.add("lo"); aliases.add("lo");
requiredParameters.add("id"); requiredParameters.add("id");
helpDescription = "Set the entrance of the gate to your current location."; helpDescription = "Set the entrance of the gate to your current location.";
requiredPermission = Plugin.permissionManage; requiredPermission = Plugin.permissionManage;
needsPermissionAtCurrentLocation = true; needsPermissionAtCurrentLocation = true;
@ -45,13 +40,10 @@ public class CommandLocation extends BaseLocationCommand
senderMustBePlayer = true; senderMustBePlayer = true;
} }
public void perform() {
public void perform()
{
Location playerLocation = getValidPlayerLocation(); Location playerLocation = getValidPlayerLocation();
if (playerLocation == null) if (playerLocation == null) {
{
sendMessage("There is not enough room for a gate to open here"); sendMessage("There is not enough room for a gate to open here");
return; return;
} }
@ -60,25 +52,19 @@ public class CommandLocation extends BaseLocationCommand
Set<Location> oldGateBlockLocations = gate.getGateBlockLocations(); Set<Location> oldGateBlockLocations = gate.getGateBlockLocations();
Set<Block> oldFrameBlocks = gate.getGateFrameBlocks(); Set<Block> oldFrameBlocks = gate.getGateFrameBlocks();
try try {
{
if (gate.isOpen()) { if (gate.isOpen()) {
GateBlockChangeSender.updateGateBlocks(gate, true); GateBlockChangeSender.updateGateBlocks(gate, true);
} }
gate.setLocation(playerLocation); gate.setLocation(playerLocation);
sendMessage(ChatColor.GREEN + "The location of '" + gate.getId() + "' is now at your current location."); sendMessage(ChatColor.GREEN + "The location of '" + gate.getId() + "' is now at your current location.");
} } catch (Exception e) {
catch (Exception e)
{
sendMessage(ChatColor.RED + "There seems to be no frame at your new location! The gate got closed!" + ChatColor.AQUA + " You should build a frame now and execute:"); sendMessage(ChatColor.RED + "There seems to be no frame at your new location! The gate got closed!" + ChatColor.AQUA + " You should build a frame now and execute:");
sendMessage(new CommandOpen().getUsageTemplate(true, true)); sendMessage(new CommandOpen().getUsageTemplate(true, true));
} } finally {
finally {
Plugin.getPlugin().getGatesManager().handleGateLocationChange(gate, oldLocation, oldGateBlockLocations, oldFrameBlocks); Plugin.getPlugin().getGatesManager().handleGateLocationChange(gate, oldLocation, oldGateBlockLocations, oldFrameBlocks);
GateBlockChangeSender.updateGateBlocks(gate); GateBlockChangeSender.updateGateBlocks(gate);
} }
} }
} }

20
src/de/craftinc/gates/commands/CommandNearby.java
View File

@ -1,6 +1,5 @@
package de.craftinc.gates.commands; package de.craftinc.gates.commands;
import de.craftinc.gates.Gate; import de.craftinc.gates.Gate;
import de.craftinc.gates.GatesManager; import de.craftinc.gates.GatesManager;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
@ -10,33 +9,27 @@ import de.craftinc.gates.util.TextUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Set; import java.util.Set;
public class CommandNearby extends BaseLocationCommand public class CommandNearby extends BaseLocationCommand {
{
public CommandNearby() public CommandNearby() {
{
aliases.add("nearby"); aliases.add("nearby");
aliases.add("nb"); aliases.add("nb");
helpDescription = "Highlight nearby gates"; helpDescription = "Highlight nearby gates";
requiredPermission = Plugin.permissionInfo; requiredPermission = Plugin.permissionInfo;
needsPermissionAtCurrentLocation = true; needsPermissionAtCurrentLocation = true;
shouldPersistToDisk = false; shouldPersistToDisk = false;
senderMustBePlayer = true; senderMustBePlayer = true;
hasGateParam = false; hasGateParam = false;
} }
public void perform() {
public void perform()
{
GatesManager manager = Plugin.getPlugin().getGatesManager(); GatesManager manager = Plugin.getPlugin().getGatesManager();
Set<Gate> nearbyGates = manager.getNearbyGates(player.getLocation().getChunk()); Set<Gate> nearbyGates = manager.getNearbyGates(player.getLocation().getChunk());
if (nearbyGates == null) { if (nearbyGates == null) {
player.sendMessage("There are no gates near you!"); player.sendMessage("There are no gates near you!");
} } else {
else {
GateBlockChangeSender.temporaryHighlightGatesFrames(player, nearbyGates); GateBlockChangeSender.temporaryHighlightGatesFrames(player, nearbyGates);
ArrayList<String> gateNames = new ArrayList<String>(); ArrayList<String> gateNames = new ArrayList<String>();
@ -44,10 +37,7 @@ public class CommandNearby extends BaseLocationCommand
for (Gate g : nearbyGates) { for (Gate g : nearbyGates) {
gateNames.add(g.getId()); gateNames.add(g.getId());
} }
player.sendMessage("Nearby gates: " + TextUtil.implode(gateNames, ", ")); player.sendMessage("Nearby gates: " + TextUtil.implode(gateNames, ", "));
} }
} }
} }

23
src/de/craftinc/gates/commands/CommandNew.java
View File

@ -23,11 +23,9 @@ import de.craftinc.gates.Gate;
import de.craftinc.gates.GatesManager; import de.craftinc.gates.GatesManager;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
public class CommandNew extends BaseLocationCommand {
public class CommandNew extends BaseLocationCommand public CommandNew() {
{
public CommandNew()
{
aliases.add("new"); aliases.add("new");
aliases.add("n"); aliases.add("n");
@ -35,20 +33,14 @@ public class CommandNew extends BaseLocationCommand
senderMustBePlayer = true; senderMustBePlayer = true;
hasGateParam = false; hasGateParam = false;
helpDescription = "Create a gate at your current location."; helpDescription = "Create a gate at your current location.";
requiredPermission = Plugin.permissionManage; requiredPermission = Plugin.permissionManage;
needsPermissionAtCurrentLocation = true; needsPermissionAtCurrentLocation = true;
shouldPersistToDisk = true; shouldPersistToDisk = true;
senderMustBePlayer = true; senderMustBePlayer = true;
} }
public void perform() {
public void perform()
{
String id = parameters.get(0); String id = parameters.get(0);
GatesManager gatesManager = Plugin.getPlugin().getGatesManager(); GatesManager gatesManager = Plugin.getPlugin().getGatesManager();
@ -60,19 +52,15 @@ public class CommandNew extends BaseLocationCommand
gate = new Gate(id); gate = new Gate(id);
sendMessage(ChatColor.GREEN + "Gate with id '" + id + "' was created."); sendMessage(ChatColor.GREEN + "Gate with id '" + id + "' was created.");
Location playerLocation = getValidPlayerLocation(); Location playerLocation = getValidPlayerLocation();
if (playerLocation != null) { if (playerLocation != null) {
try { try {
gate.setLocation(playerLocation); gate.setLocation(playerLocation);
sendMessage(ChatColor.AQUA + "The gates location has been set to your current location."); sendMessage(ChatColor.AQUA + "The gates location has been set to your current location.");
} catch (Exception ignored) {
} }
catch (Exception ignored) {} } else {
}
else
{
sendMessage(ChatColor.RED + "Your location is invalid!" + ChatColor.AQUA + "Go somewhere else and execute:"); sendMessage(ChatColor.RED + "Your location is invalid!" + ChatColor.AQUA + "Go somewhere else and execute:");
sendMessage(new CommandLocation().getUsageTemplate(true, true)); sendMessage(new CommandLocation().getUsageTemplate(true, true));
} }
@ -80,4 +68,3 @@ public class CommandNew extends BaseLocationCommand
gatesManager.handleNewGate(gate); gatesManager.handleNewGate(gate);
} }
} }

18
src/de/craftinc/gates/commands/CommandOpen.java
View File

@ -16,25 +16,19 @@
*/ */
package de.craftinc.gates.commands; package de.craftinc.gates.commands;
import de.craftinc.gates.util.GateBlockChangeSender; import de.craftinc.gates.util.GateBlockChangeSender;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
public class CommandOpen extends BaseCommand {
public class CommandOpen extends BaseCommand public CommandOpen() {
{
public CommandOpen()
{
aliases.add("open"); aliases.add("open");
aliases.add("o"); aliases.add("o");
requiredParameters.add("id"); requiredParameters.add("id");
helpDescription = "Open a gate so players can use it."; helpDescription = "Open a gate so players can use it.";
requiredPermission = Plugin.permissionManage; requiredPermission = Plugin.permissionManage;
needsPermissionAtCurrentLocation = false; needsPermissionAtCurrentLocation = false;
@ -42,9 +36,7 @@ public class CommandOpen extends BaseCommand
senderMustBePlayer = false; senderMustBePlayer = false;
} }
public void perform() {
public void perform()
{
try { try {
boolean needsGateManagerUpdate = false; boolean needsGateManagerUpdate = false;
@ -61,10 +53,8 @@ public class CommandOpen extends BaseCommand
} }
sendMessage(ChatColor.GREEN + "The gate was opened."); sendMessage(ChatColor.GREEN + "The gate was opened.");
} } catch (Exception e) {
catch (Exception e) {
sendMessage(ChatColor.RED + e.getMessage()); sendMessage(ChatColor.RED + e.getMessage());
} }
} }
} }

10
src/de/craftinc/gates/commands/CommandRemove.java
View File

@ -21,11 +21,9 @@ import org.bukkit.ChatColor;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
public class CommandRemove extends BaseCommand {
public class CommandRemove extends BaseCommand public CommandRemove() {
{
public CommandRemove()
{
aliases.add("delete"); aliases.add("delete");
aliases.add("del"); aliases.add("del");
aliases.add("remove"); aliases.add("remove");
@ -43,9 +41,7 @@ public class CommandRemove extends BaseCommand
senderMustBePlayer = false; senderMustBePlayer = false;
} }
public void perform() {
public void perform()
{
Plugin.getPlugin().getGatesManager().handleDeletion(gate); Plugin.getPlugin().getGatesManager().handleDeletion(gate);
GateBlockChangeSender.updateGateBlocks(gate, true); GateBlockChangeSender.updateGateBlocks(gate, true);
sendMessage(ChatColor.GREEN + "Gate with id '" + gate.getId() + "' was deleted."); sendMessage(ChatColor.GREEN + "Gate with id '" + gate.getId() + "' was deleted.");

13
src/de/craftinc/gates/commands/CommandRename.java
View File

@ -21,11 +21,9 @@ import org.bukkit.ChatColor;
import de.craftinc.gates.GatesManager; import de.craftinc.gates.GatesManager;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
public class CommandRename extends BaseCommand {
public class CommandRename extends BaseCommand public CommandRename() {
{
public CommandRename()
{
aliases.add("rename"); aliases.add("rename");
aliases.add("rn"); aliases.add("rn");
@ -45,15 +43,13 @@ public class CommandRename extends BaseCommand
} }
public void perform() public void perform() {
{
String newId = parameters.get(1); String newId = parameters.get(1);
GatesManager gatesManager = Plugin.getPlugin().getGatesManager(); GatesManager gatesManager = Plugin.getPlugin().getGatesManager();
if (gatesManager.gateExists(newId)) { if (gatesManager.gateExists(newId)) {
sendMessage(ChatColor.RED + "Cannot rename " + gate.getId() + ". There is already a gate named " + newId + "."); sendMessage(ChatColor.RED + "Cannot rename " + gate.getId() + ". There is already a gate named " + newId + ".");
} } else {
else {
String oldId = gate.getId(); String oldId = gate.getId();
gate.setId(newId); gate.setId(newId);
@ -62,5 +58,4 @@ public class CommandRename extends BaseCommand
sendMessage(ChatColor.GREEN + "Gate " + gate.getId() + " is now known as " + newId + "."); sendMessage(ChatColor.GREEN + "Gate " + gate.getId() + " is now known as " + newId + ".");
} }
} }
} }

21
src/de/craftinc/gates/commands/CommandUnhide.java
View File

@ -21,38 +21,27 @@ import org.bukkit.ChatColor;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
public class CommandUnhide extends BaseCommand {
public class CommandUnhide extends BaseCommand public CommandUnhide() {
{
public CommandUnhide()
{
aliases.add("unhide"); aliases.add("unhide");
aliases.add("u"); aliases.add("u");
requiredParameters.add("id"); requiredParameters.add("id");
helpDescription = "Make that gate visible"; helpDescription = "Make that gate visible";
requiredPermission = Plugin.permissionManage; requiredPermission = Plugin.permissionManage;
needsPermissionAtCurrentLocation = false; needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true; shouldPersistToDisk = true;
senderMustBePlayer = false; senderMustBePlayer = false;
} }
public void perform() {
public void perform() try {
{
try
{
gate.setHidden(false); gate.setHidden(false);
GateBlockChangeSender.updateGateBlocks(gate); GateBlockChangeSender.updateGateBlocks(gate);
sendMessage(ChatColor.GREEN + "The gate " + gate.getId() + " is now visible."); sendMessage(ChatColor.GREEN + "The gate " + gate.getId() + " is now visible.");
} } catch (Exception e) {
catch (Exception e) {
sendMessage(ChatColor.RED + e.getMessage()); sendMessage(ChatColor.RED + e.getMessage());
} }
} }
} }

8
src/de/craftinc/gates/listeners/BlockBreakListener.java
View File

@ -25,11 +25,9 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockBreakEvent;
public class BlockBreakListener implements Listener public class BlockBreakListener implements Listener {
{
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onBlockBreak(BlockBreakEvent event) public void onBlockBreak(BlockBreakEvent event) {
{
if (event.isCancelled()) { if (event.isCancelled()) {
return; return;
} }
@ -39,8 +37,8 @@ public class BlockBreakListener implements Listener
if (gate != null && !gate.isHidden()) { if (gate != null && !gate.isHidden()) {
try { try {
gate.setOpen(false); gate.setOpen(false);
} catch (Exception ignored) {
} }
catch (Exception ignored) { }
GateBlockChangeSender.updateGateBlocks(gate); GateBlockChangeSender.updateGateBlocks(gate);
} }

6
src/de/craftinc/gates/listeners/PlayerChangedWorldListener.java
View File

@ -24,11 +24,9 @@ import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerChangedWorldEvent; import org.bukkit.event.player.PlayerChangedWorldEvent;
public class PlayerChangedWorldListener implements Listener public class PlayerChangedWorldListener implements Listener {
{
@EventHandler(priority = EventPriority.NORMAL) @EventHandler(priority = EventPriority.NORMAL)
public void onPlayerChangeWorld(PlayerChangedWorldEvent event) public void onPlayerChangeWorld(PlayerChangedWorldEvent event) {
{
GateBlockChangeSender.updateGateBlocks(event.getPlayer()); GateBlockChangeSender.updateGateBlocks(event.getPlayer());
} }
} }

6
src/de/craftinc/gates/listeners/PlayerJoinListener.java
View File

@ -23,11 +23,9 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
public class PlayerJoinListener implements Listener public class PlayerJoinListener implements Listener {
{
@EventHandler(priority = EventPriority.NORMAL) @EventHandler(priority = EventPriority.NORMAL)
public void onPlayerJoin(PlayerJoinEvent event) public void onPlayerJoin(PlayerJoinEvent event) {
{
GateBlockChangeSender.updateGateBlocks(event.getPlayer()); GateBlockChangeSender.updateGateBlocks(event.getPlayer());
} }
} }

26
src/de/craftinc/gates/listeners/PlayerMoveListener.java
View File

@ -38,13 +38,11 @@ import de.craftinc.gates.Plugin;
import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.scheduler.BukkitScheduler;
public class PlayerMoveListener implements Listener public class PlayerMoveListener implements Listener {
{
protected HashMap<String, Long> lastNoPermissionMessages = new HashMap<String, Long>(); protected HashMap<String, Long> lastNoPermissionMessages = new HashMap<String, Long>();
@EventHandler(priority = EventPriority.NORMAL) @EventHandler(priority = EventPriority.NORMAL)
public void onPlayerMove(PlayerMoveEvent event) public void onPlayerMove(PlayerMoveEvent event) {
{
if (event.isCancelled()) { if (event.isCancelled()) {
return; return;
} }
@ -80,8 +78,7 @@ public class PlayerMoveListener implements Listener
event.getPlayer().sendMessage(ChatColor.RED + noPermissionString); event.getPlayer().sendMessage(ChatColor.RED + noPermissionString);
this.lastNoPermissionMessages.put(playerName, now); this.lastNoPermissionMessages.put(playerName, now);
} }
} } else {
else {
this.teleportPlayer(event.getPlayer(), gateAtLocation); this.teleportPlayer(event.getPlayer(), gateAtLocation);
} }
} }
@ -89,14 +86,14 @@ public class PlayerMoveListener implements Listener
/** /**
* Teleports a player. * Teleports a player.
*
* @param player The player to teleport. * @param player The player to teleport.
* @param gate The gate to which exit the player will be teleported. * @param gate The gate to which exit the player will be teleported.
*/ */
private void teleportPlayer(final Player player, final Gate gate) private void teleportPlayer(final Player player, final Gate gate) {
{
// Destination // Destination
final Float newYaw = gate.getExit().getYaw() - gate.getLocation().getYaw() + player.getLocation().getYaw(); final Float newYaw = gate.getExit().getYaw() - gate.getLocation().getYaw() + player.getLocation().getYaw();
final Location destLocation = new Location( gate.getExit().getWorld(), final Location destLocation = new Location(gate.getExit().getWorld(),
gate.getExit().getX(), gate.getExit().getX(),
gate.getExit().getY(), gate.getExit().getY(),
gate.getExit().getZ(), gate.getExit().getZ(),
@ -135,12 +132,11 @@ public class PlayerMoveListener implements Listener
destLocation.getChunk().load(); // load the destination chunk, no new entity will be created otherwise destLocation.getChunk().load(); // load the destination chunk, no new entity will be created otherwise
scheduler.scheduleSyncDelayedTask(plugin, new Runnable() { scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
public void run() public void run() {
{
// FIXME: the code below should be executed after the chunk got loaded and not after a fixed time! // FIXME: the code below should be executed after the chunk got loaded and not after a fixed time!
// create a new entity at the destination location // create a new entity at the destination location
final Vehicle newVehicle = VehicleCloner.clone((Vehicle)vehicle, destLocation); final Vehicle newVehicle = VehicleCloner.clone((Vehicle) vehicle, destLocation);
newVehicle.setPassenger(player); newVehicle.setPassenger(player);
} }
}, 2); }, 2);
@ -154,12 +150,10 @@ public class PlayerMoveListener implements Listener
} }
protected boolean hasPermission(final Player player, final Gate gate) protected boolean hasPermission(final Player player, final Gate gate) {
{
if (Plugin.getPermission() == null) { // fallback: use the standard bukkit permission system if (Plugin.getPermission() == null) { // fallback: use the standard bukkit permission system
return player.hasPermission(Plugin.permissionUse); return player.hasPermission(Plugin.permissionUse);
} } else {
else {
final boolean permAtLocation = Plugin.getPermission().has(gate.getLocation().getWorld(), player.getName(), Plugin.permissionUse); final boolean permAtLocation = Plugin.getPermission().has(gate.getLocation().getWorld(), player.getName(), Plugin.permissionUse);
final boolean permAtExit = Plugin.getPermission().has(gate.getExit().getWorld(), player.getName(), Plugin.permissionUse); final boolean permAtExit = Plugin.getPermission().has(gate.getExit().getWorld(), player.getName(), Plugin.permissionUse);

6
src/de/craftinc/gates/listeners/PlayerRespawnListener.java
View File

@ -24,11 +24,9 @@ import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerRespawnEvent;
public class PlayerRespawnListener implements Listener public class PlayerRespawnListener implements Listener {
{
@EventHandler(priority = EventPriority.NORMAL) @EventHandler(priority = EventPriority.NORMAL)
public void onPlayerRespawn(PlayerRespawnEvent event) public void onPlayerRespawn(PlayerRespawnEvent event) {
{
GateBlockChangeSender.updateGateBlocks(event.getPlayer(), event.getRespawnLocation(), true); GateBlockChangeSender.updateGateBlocks(event.getPlayer(), event.getRespawnLocation(), true);
} }
} }

6
src/de/craftinc/gates/listeners/PlayerTeleportListener.java
View File

@ -23,11 +23,9 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.player.PlayerTeleportEvent;
public class PlayerTeleportListener implements Listener public class PlayerTeleportListener implements Listener {
{
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPlayerTeleport(PlayerTeleportEvent event) public void onPlayerTeleport(PlayerTeleportEvent event) {
{
if (event.isCancelled()) { if (event.isCancelled()) {
return; return;
} }

22
src/de/craftinc/gates/persistence/LocationUtil.java
View File

@ -18,22 +18,21 @@ package de.craftinc.gates.persistence;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
public class LocationUtil public class LocationUtil {
{
protected final static String worldKey = "world"; protected final static String worldKey = "world";
protected final static String xKey = "x"; protected final static String xKey = "x";
protected final static String yKey = "y"; protected final static String yKey = "y";
protected final static String zKey = "z"; protected final static String zKey = "z";
protected static World getWorld(final String name) throws Exception protected static World getWorld(final String name) throws Exception {
{
if (name == null) { if (name == null) {
throw new IllegalArgumentException("The name of the world must not be 'null"); throw new IllegalArgumentException("The name of the world must not be 'null");
} }
@ -55,8 +54,7 @@ public class LocationUtil
* @param l The location to serialize. Supplying 'null' is ok.. * @param l The location to serialize. Supplying 'null' is ok..
* @return A Map object ready for storing inside a yaml file. Will return 'null' if 'l' is null. * @return A Map object ready for storing inside a yaml file. Will return 'null' if 'l' is null.
*/ */
public static Map<String, Object> serializeLocation(final Location l) public static Map<String, Object> serializeLocation(final Location l) {
{
if (l == null) { if (l == null) {
return null; return null;
} }
@ -73,23 +71,21 @@ public class LocationUtil
/** /**
*
* @param map A map generated with the 'serializeLocation' method. Supplying 'null' is ok. * @param map A map generated with the 'serializeLocation' method. Supplying 'null' is ok.
* @return A deserialized location. This method will return 'null' if 'map' is null! * @return A deserialized location. This method will return 'null' if 'map' is null!
* @throws Exception This method will throw an exception if the world of the supplied serialized location * @throws Exception This method will throw an exception if the world of the supplied serialized location
* does not exist or if 'map' does not contain all necessary keys! * does not exist or if 'map' does not contain all necessary keys!
*/ */
public static Location deserializeLocation(final Map<String, Object> map) throws Exception public static Location deserializeLocation(final Map<String, Object> map) throws Exception {
{
if (map == null) { if (map == null) {
return null; return null;
} }
World w = getWorld((String)map.get(worldKey)); World w = getWorld((String) map.get(worldKey));
Number x = (Number)map.get(xKey); Number x = (Number) map.get(xKey);
Number y = (Number)map.get(yKey); Number y = (Number) map.get(yKey);
Number z = (Number)map.get(zKey); Number z = (Number) map.get(zKey);
if (x == null || y == null || z == null) { if (x == null || y == null || z == null) {
throw new IllegalArgumentException("Supplied map is invalid x, y or z coordinate was not supplied"); throw new IllegalArgumentException("Supplied map is invalid x, y or z coordinate was not supplied");

18
src/de/craftinc/gates/persistence/MigrationUtil.java
View File

@ -27,30 +27,25 @@ import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
public class MigrationUtil public class MigrationUtil {
{ public static boolean performMigration(int storageVersion, int currentVersion, List<Gate> gates) {
public static boolean performMigration(int storageVersion, int currentVersion, List<Gate> gates)
{
if (storageVersion == 0 && currentVersion >= 2) { if (storageVersion == 0 && currentVersion >= 2) {
removePortalBlocks(gates); removePortalBlocks(gates);
updateAllowVehicles(gates); updateAllowVehicles(gates);
return true; return true;
} } else if (storageVersion == 1 && currentVersion >= 2) {
else if (storageVersion == 1 && currentVersion >= 2) {
updateAllowVehicles(gates); updateAllowVehicles(gates);
return true; return true;
} } else {
else {
Plugin.log(Level.SEVERE, "Supplied storage version is currently not supported! Make sure you have the latest version of Craft Inc. Gates installed. Plugin will be disabled!"); Plugin.log(Level.SEVERE, "Supplied storage version is currently not supported! Make sure you have the latest version of Craft Inc. Gates installed. Plugin will be disabled!");
return false; return false;
} }
} }
protected static void removePortalBlocks(List<Gate> gates) protected static void removePortalBlocks(List<Gate> gates) {
{
for (Gate g : gates) { for (Gate g : gates) {
for (Location l : g.getGateBlockLocations()) { for (Location l : g.getGateBlockLocations()) {
@ -64,8 +59,7 @@ public class MigrationUtil
} }
protected static void updateAllowVehicles(List<Gate> gates) protected static void updateAllowVehicles(List<Gate> gates) {
{
for (Gate g : gates) { for (Gate g : gates) {
g.setAllowsVehicles(true); g.setAllowsVehicles(true);

75
src/de/craftinc/gates/util/ConfigurationUtil.java
View File

@ -23,8 +23,7 @@ import org.bukkit.Material;
import java.util.logging.Level; import java.util.logging.Level;
public class ConfigurationUtil public class ConfigurationUtil {
{
public static final String confMaxGateBlocksKey = "maxGateBlocks"; public static final String confMaxGateBlocksKey = "maxGateBlocks";
public static final String confPlayerGateBlockUpdateRadiusKey = "playerGateBlockUpdateRadius"; public static final String confPlayerGateBlockUpdateRadiusKey = "playerGateBlockUpdateRadius";
public static final String confCheckForBrokenGateFramesKey = "checkForBrokenGateFrames"; public static final String confCheckForBrokenGateFramesKey = "checkForBrokenGateFrames";
@ -38,79 +37,56 @@ public class ConfigurationUtil
public static final String confGateMaterialKey = "gateMaterial"; public static final String confGateMaterialKey = "gateMaterial";
public static GateMaterial getPortalMaterial() public static GateMaterial getPortalMaterial() {
{
String materialString = Plugin.getPlugin().getConfig().getString(confGateMaterialKey); String materialString = Plugin.getPlugin().getConfig().getString(confGateMaterialKey);
GateMaterial material = new GateMaterial(); GateMaterial material = new GateMaterial();
if (materialString.equals("sapling")) { if (materialString.equals("sapling")) {
material.material = Material.SAPLING; material.material = Material.SAPLING;
} } else if (materialString.equals("water")) {
else if (materialString.equals("water")) {
material.material = Material.STATIONARY_WATER; material.material = Material.STATIONARY_WATER;
} } else if (materialString.equals("lava")) {
else if (materialString.equals("lava")) {
material.material = Material.STATIONARY_LAVA; material.material = Material.STATIONARY_LAVA;
} } else if (materialString.equals("cobweb")) {
else if (materialString.equals("cobweb")) {
material.material = Material.WEB; material.material = Material.WEB;
} } else if (materialString.equals("grass")) {
else if (materialString.equals("grass")) {
material.material = Material.LONG_GRASS; material.material = Material.LONG_GRASS;
material.data = 1; material.data = 1;
} } else if (materialString.equals("dead bush")) {
else if (materialString.equals("dead bush")) {
material.material = Material.DEAD_BUSH; material.material = Material.DEAD_BUSH;
} } else if (materialString.equals("dandelion")) {
else if (materialString.equals("dandelion")) {
material.material = Material.YELLOW_FLOWER; material.material = Material.YELLOW_FLOWER;
} } else if (materialString.equals("poppy")) {
else if (materialString.equals("poppy")) {
material.material = Material.RED_ROSE; material.material = Material.RED_ROSE;
} } else if (materialString.equals("brown mushroom")) {
else if (materialString.equals("brown mushroom")) {
material.material = Material.BROWN_MUSHROOM; material.material = Material.BROWN_MUSHROOM;
} } else if (materialString.equals("red mushroom")) {
else if (materialString.equals("red mushroom")) {
material.material = Material.RED_MUSHROOM; material.material = Material.RED_MUSHROOM;
} } else if (materialString.equals("torch")) {
else if (materialString.equals("torch")) {
material.material = Material.TORCH; material.material = Material.TORCH;
} } else if (materialString.equals("redstone torch (off)")) {
else if (materialString.equals("redstone torch (off)")) {
material.material = Material.REDSTONE_TORCH_OFF; material.material = Material.REDSTONE_TORCH_OFF;
} } else if (materialString.equals("redstone torch (on)")) {
else if (materialString.equals("redstone torch (on)")) {
material.material = Material.REDSTONE_TORCH_ON; material.material = Material.REDSTONE_TORCH_ON;
} } else if (materialString.equals("fence")) {
else if (materialString.equals("fence")) {
material.material = Material.FENCE; material.material = Material.FENCE;
} } else if (materialString.equals("nether portal")) {
else if (materialString.equals("nether portal")) {
material.material = Material.PORTAL; material.material = Material.PORTAL;
} } else if (materialString.equals("iron bars")) {
else if (materialString.equals("iron bars")) {
material.material = Material.IRON_FENCE; material.material = Material.IRON_FENCE;
} } else if (materialString.equals("glass pane")) {
else if (materialString.equals("glass pane")) {
material.material = Material.THIN_GLASS; material.material = Material.THIN_GLASS;
} } else if (materialString.equals("fence gate")) {
else if (materialString.equals("fence gate")) {
material.material = Material.FENCE_GATE; material.material = Material.FENCE_GATE;
} } else if (materialString.equals("nether brick fence")) {
else if (materialString.equals("nether brick fence")) {
material.material = Material.NETHER_FENCE; material.material = Material.NETHER_FENCE;
} } else if (materialString.equals("nether wart")) {
else if (materialString.equals("nether wart")) {
material.material = Material.NETHER_WARTS; material.material = Material.NETHER_WARTS;
} } else if (materialString.equals("end portal")) {
else if (materialString.equals("end portal")) {
material.material = Material.ENDER_PORTAL; material.material = Material.ENDER_PORTAL;
} } else if (materialString.equals("cobblestone wall")) {
else if (materialString.equals("cobblestone wall")) {
material.material = Material.COBBLE_WALL; material.material = Material.COBBLE_WALL;
} } else { // fallback!
else { // fallback!
material.material = Material.PORTAL; material.material = Material.PORTAL;
Plugin.log(Level.WARNING, "Gate material invalid! Please check and correct your configuration file!"); Plugin.log(Level.WARNING, "Gate material invalid! Please check and correct your configuration file!");
} }
@ -120,8 +96,7 @@ public class ConfigurationUtil
} }
class GateMaterial class GateMaterial {
{
public Material material = Material.PORTAL; public Material material = Material.PORTAL;
public byte data = 0; public byte data = 0;
} }

27
src/de/craftinc/gates/util/FloodUtil.java
View File

@ -28,13 +28,11 @@ import org.bukkit.block.BlockFace;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
public class FloodUtil public class FloodUtil {
{
protected static final Set<BlockFace> exp1 = new HashSet<BlockFace>(); protected static final Set<BlockFace> exp1 = new HashSet<BlockFace>();
protected static final Set<BlockFace> exp2 = new HashSet<BlockFace>(); protected static final Set<BlockFace> exp2 = new HashSet<BlockFace>();
static static {
{
exp1.add(BlockFace.UP); exp1.add(BlockFace.UP);
exp1.add(BlockFace.DOWN); exp1.add(BlockFace.DOWN);
exp1.add(BlockFace.EAST); exp1.add(BlockFace.EAST);
@ -49,11 +47,11 @@ public class FloodUtil
/** /**
* Returns the all frame blocks of an gate. * Returns the all frame blocks of an gate.
*
* @param blocks All blocks inside the gate. * @param blocks All blocks inside the gate.
* @return A Set containing all frame block. Will never return 'null'. * @return A Set containing all frame block. Will never return 'null'.
*/ */
public static Set<Block> getFrame(final Set<Block> blocks) public static Set<Block> getFrame(final Set<Block> blocks) {
{
if (blocks == null || blocks.isEmpty()) { if (blocks == null || blocks.isEmpty()) {
return new HashSet<Block>(); return new HashSet<Block>();
} }
@ -81,8 +79,7 @@ public class FloodUtil
if (gateFrameSearchFaces != null) { if (gateFrameSearchFaces != null) {
return _getFrame(blocks, gateFrameSearchFaces); return _getFrame(blocks, gateFrameSearchFaces);
} } else { // no direction found (the gate might only consist of blocks one over another)
else { // no direction found (the gate might only consist of blocks one over another)
// Try one direction and check if the found blocks are not air. // Try one direction and check if the found blocks are not air.
// If air is found (frame broken or wrong direction) return the other direction // If air is found (frame broken or wrong direction) return the other direction
@ -100,9 +97,7 @@ public class FloodUtil
} }
protected static Set<Block> _getFrame(final Set<Block> blocks, final Set<BlockFace> searchDirections) {
protected static Set<Block> _getFrame(final Set<Block> blocks, final Set<BlockFace> searchDirections)
{
Set<Block> frameBlocks = new HashSet<Block>(); Set<Block> frameBlocks = new HashSet<Block>();
for (Block b : blocks) { for (Block b : blocks) {
@ -122,11 +117,11 @@ public class FloodUtil
/** /**
* Returns the all frame blocks of an gate. * Returns the all frame blocks of an gate.
*
* @param locations All locations inside the gate. * @param locations All locations inside the gate.
* @return A Set containing all frame block. Will never return 'null'. * @return A Set containing all frame block. Will never return 'null'.
*/ */
public static Set<Block> getFrameWithLocations(final Set<Location> locations) public static Set<Block> getFrameWithLocations(final Set<Location> locations) {
{
if (locations == null) { if (locations == null) {
throw new IllegalArgumentException("'locations' must not be 'null'"); throw new IllegalArgumentException("'locations' must not be 'null'");
} }
@ -142,8 +137,7 @@ public class FloodUtil
// For the same frame and location this set of blocks is deterministic // For the same frame and location this set of blocks is deterministic
public static Set<Block> getGatePortalBlocks(final Block block) public static Set<Block> getGatePortalBlocks(final Block block) {
{
if (block == null) { if (block == null) {
throw new IllegalArgumentException("'block' must not be 'null'"); throw new IllegalArgumentException("'block' must not be 'null'");
} }
@ -176,8 +170,7 @@ public class FloodUtil
protected static Set<Block> getAirFloodBlocks(final Block startBlock, protected static Set<Block> getAirFloodBlocks(final Block startBlock,
Set<Block> foundBlocks, Set<Block> foundBlocks,
final Set<BlockFace> expandFaces, final Set<BlockFace> expandFaces,
int limit) int limit) {
{
if (foundBlocks == null) { if (foundBlocks == null) {
return null; return null;
} }

50
src/de/craftinc/gates/util/GateBlockChangeSender.java
View File

@ -32,17 +32,16 @@ import java.util.Set;
import static de.craftinc.gates.util.ConfigurationUtil.*; import static de.craftinc.gates.util.ConfigurationUtil.*;
public class GateBlockChangeSender public class GateBlockChangeSender {
{
/** /**
* Replaces gate frame blocks with glowstone for a short period of time. * Replaces gate frame blocks with glowstone for a short period of time.
* Uses the data stored in 'highlightDuration' inside the config file * Uses the data stored in 'highlightDuration' inside the config file
* for determining when to de-highlight the frames. * for determining when to de-highlight the frames.
*
* @param player The player for whom the frame should be highlighted. * @param player The player for whom the frame should be highlighted.
* Must not be null! * Must not be null!
*/ */
public static void temporaryHighlightGatesFrames(final Player player, final Set<Gate> gates) public static void temporaryHighlightGatesFrames(final Player player, final Set<Gate> gates) {
{
if (player == null) { if (player == null) {
throw new IllegalArgumentException("'player' must not be 'null'!"); throw new IllegalArgumentException("'player' must not be 'null'!");
} }
@ -55,7 +54,7 @@ public class GateBlockChangeSender
Set<Block> frameBlocks = g.getGateFrameBlocks(); Set<Block> frameBlocks = g.getGateFrameBlocks();
for (Block b : frameBlocks) { for (Block b : frameBlocks) {
player.sendBlockChange(b.getLocation(), Material.GLOWSTONE, (byte)0); player.sendBlockChange(b.getLocation(), Material.GLOWSTONE, (byte) 0);
} }
} }
@ -71,8 +70,7 @@ public class GateBlockChangeSender
} }
public static void temporaryHighlightGateFrame(final Player player, final Gate gate) public static void temporaryHighlightGateFrame(final Player player, final Gate gate) {
{
if (gate == null) { if (gate == null) {
throw new IllegalArgumentException("'gate' must not be 'null!"); throw new IllegalArgumentException("'gate' must not be 'null!");
} }
@ -84,7 +82,7 @@ public class GateBlockChangeSender
Set<Block> frameBlocks = gate.getGateFrameBlocks(); Set<Block> frameBlocks = gate.getGateFrameBlocks();
for (Block b : frameBlocks) { for (Block b : frameBlocks) {
player.sendBlockChange(b.getLocation(), Material.GLOWSTONE, (byte)0); player.sendBlockChange(b.getLocation(), Material.GLOWSTONE, (byte) 0);
} }
Plugin plugin = Plugin.getPlugin(); Plugin plugin = Plugin.getPlugin();
@ -99,24 +97,22 @@ public class GateBlockChangeSender
} }
protected static void dehighlightGatesFrames(final Player player, final Set<Gate> gates) protected static void dehighlightGatesFrames(final Player player, final Set<Gate> gates) {
{
for (Gate g : gates) { for (Gate g : gates) {
Set<Block> frameBlocks = g.getGateFrameBlocks(); Set<Block> frameBlocks = g.getGateFrameBlocks();
for (Block b : frameBlocks) { for (Block b : frameBlocks) {
player.sendBlockChange(b.getLocation(), b.getType(), (byte)0); player.sendBlockChange(b.getLocation(), b.getType(), (byte) 0);
} }
} }
} }
protected static void dehighlightGateFrame(final Player player, final Gate gate) protected static void dehighlightGateFrame(final Player player, final Gate gate) {
{
Set<Block> frameBlocks = gate.getGateFrameBlocks(); Set<Block> frameBlocks = gate.getGateFrameBlocks();
for (Block b : frameBlocks) { for (Block b : frameBlocks) {
player.sendBlockChange(b.getLocation(), b.getType(), (byte)0); player.sendBlockChange(b.getLocation(), b.getType(), (byte) 0);
} }
} }
@ -124,13 +120,13 @@ public class GateBlockChangeSender
/** /**
* Sends gate blocks to player at a given location. Will send the updates either immediately or * Sends gate blocks to player at a given location. Will send the updates either immediately or
* immediately and after a short delay. * immediately and after a short delay.
*
* @param player A player to send block changes to. Must not be null! * @param player A player to send block changes to. Must not be null!
* @param location The location to look for gates nearby. Must not be null! * @param location The location to look for gates nearby. Must not be null!
* @param sendDelayed Set to 'true' if the block changes shall be send a second time after a one * @param sendDelayed Set to 'true' if the block changes shall be send a second time after a one
* second delay. * second delay.
*/ */
public static void updateGateBlocks(final Player player, final Location location, boolean sendDelayed) public static void updateGateBlocks(final Player player, final Location location, boolean sendDelayed) {
{
if (player == null) { if (player == null) {
throw new IllegalArgumentException("'player' must not be 'null'!"); throw new IllegalArgumentException("'player' must not be 'null'!");
} }
@ -161,11 +157,9 @@ public class GateBlockChangeSender
} }
if (sendDelayed) { if (sendDelayed) {
Bukkit.getScheduler().scheduleSyncDelayedTask(Plugin.getPlugin(), new Runnable() Bukkit.getScheduler().scheduleSyncDelayedTask(Plugin.getPlugin(), new Runnable() {
{
@Override @Override
public void run() public void run() {
{
updateGateBlocks(player, location, false); updateGateBlocks(player, location, false);
} }
}, 20L); }, 20L);
@ -176,16 +170,14 @@ public class GateBlockChangeSender
/** /**
* This method calls: updateGateBlocks(player, location, false); * This method calls: updateGateBlocks(player, location, false);
*/ */
public static void updateGateBlocks(final Player player, final Location location) public static void updateGateBlocks(final Player player, final Location location) {
{
updateGateBlocks(player, location, false); updateGateBlocks(player, location, false);
} }
/** /**
* This method calls: updateGateBlocks(player, player.getLocation(), false); * This method calls: updateGateBlocks(player, player.getLocation(), false);
*/ */
public static void updateGateBlocks(final Player player) public static void updateGateBlocks(final Player player) {
{
if (player == null) { if (player == null) {
throw new IllegalArgumentException("'player' must not be 'null'!"); throw new IllegalArgumentException("'player' must not be 'null'!");
} }
@ -194,18 +186,17 @@ public class GateBlockChangeSender
} }
public static void updateGateBlocks(final Gate gate) public static void updateGateBlocks(final Gate gate) {
{
updateGateBlocks(gate, false); updateGateBlocks(gate, false);
} }
/** /**
* Sends block changes to players near a given gate. * Sends block changes to players near a given gate.
*
* @param gate Must not be 'null'! * @param gate Must not be 'null'!
* @param remove Set to true if all visible gate blocks shall be removed. * @param remove Set to true if all visible gate blocks shall be removed.
*/ */
public static void updateGateBlocks(final Gate gate, boolean remove) public static void updateGateBlocks(final Gate gate, boolean remove) {
{
if (gate == null) { if (gate == null) {
throw new IllegalArgumentException("'gate must not be 'null'!"); throw new IllegalArgumentException("'gate must not be 'null'!");
} }
@ -234,8 +225,7 @@ public class GateBlockChangeSender
if (gate.isOpen() && !gate.isHidden() && !remove) { if (gate.isOpen() && !gate.isHidden() && !remove) {
material = gateMaterial.material; material = gateMaterial.material;
data = gateMaterial.data; data = gateMaterial.data;
} } else {
else {
material = Material.AIR; material = Material.AIR;
} }

20
src/de/craftinc/gates/util/SimpleChunk.java
View File

@ -19,22 +19,19 @@ package de.craftinc.gates.util;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.World; import org.bukkit.World;
public class SimpleChunk public class SimpleChunk {
{
private int x; private int x;
private int z; private int z;
private String world; private String world;
public SimpleChunk(Chunk c) public SimpleChunk(Chunk c) {
{
this.x = c.getX(); this.x = c.getX();
this.z = c.getZ(); this.z = c.getZ();
this.world = c.getWorld().getName(); this.world = c.getWorld().getName();
} }
public SimpleChunk(int x, int z, World w) public SimpleChunk(int x, int z, World w) {
{
this.x = x; this.x = x;
this.z = z; this.z = z;
this.world = w.getName(); this.world = w.getName();
@ -42,10 +39,9 @@ public class SimpleChunk
@Override @Override
public boolean equals(Object o) public boolean equals(Object o) {
{
if (o instanceof SimpleChunk) { if (o instanceof SimpleChunk) {
SimpleChunk otherLocation = (SimpleChunk)o; SimpleChunk otherLocation = (SimpleChunk) o;
if (otherLocation.x == this.x if (otherLocation.x == this.x
&& otherLocation.z == this.z && otherLocation.z == this.z
@ -60,8 +56,7 @@ public class SimpleChunk
@Override @Override
public int hashCode() public int hashCode() {
{
int hash = 11; int hash = 11;
hash = 29 * hash + x; hash = 29 * hash + x;
hash = 37 * hash + z; hash = 37 * hash + z;
@ -72,8 +67,7 @@ public class SimpleChunk
@Override @Override
public String toString() public String toString() {
{
return this.getClass().toString() + " (x=" + this.x + " z=" + this.z + " world='" + this.world + "')"; return this.getClass().toString() + " (x=" + this.x + " z=" + this.z + " world='" + this.world + "')";
} }
} }

21
src/de/craftinc/gates/util/SimpleLocation.java
View File

@ -18,16 +18,14 @@ package de.craftinc.gates.util;
import org.bukkit.Location; import org.bukkit.Location;
public class SimpleLocation public class SimpleLocation {
{
private String world; private String world;
private int x; private int x;
private int y; private int y;
private int z; private int z;
public SimpleLocation(Location l) public SimpleLocation(Location l) {
{
this.world = l.getWorld().getName(); this.world = l.getWorld().getName();
// Using Block coordinates makes it possible to compare block locations with player locations. // Using Block coordinates makes it possible to compare block locations with player locations.
@ -38,8 +36,7 @@ public class SimpleLocation
} }
public SimpleLocation(Location l, boolean isHeadPosition) public SimpleLocation(Location l, boolean isHeadPosition) {
{
this.world = l.getWorld().getName(); this.world = l.getWorld().getName();
// Using Block coordinates makes it possible to compare block locations with player locations. // Using Block coordinates makes it possible to compare block locations with player locations.
@ -55,18 +52,15 @@ public class SimpleLocation
@Override @Override
public String toString() public String toString() {
{
return super.toString() + " x: " + x + " y: " + y + " z: " + z + " world: " + world; return super.toString() + " x: " + x + " y: " + y + " z: " + z + " world: " + world;
} }
@Override @Override
public boolean equals(final Object o) public boolean equals(final Object o) {
{
if (o instanceof SimpleLocation) { if (o instanceof SimpleLocation) {
SimpleLocation otherLocation = (SimpleLocation)o; SimpleLocation otherLocation = (SimpleLocation) o;
if (otherLocation.x == this.x if (otherLocation.x == this.x
&& otherLocation.y == this.y && otherLocation.y == this.y
@ -82,8 +76,7 @@ public class SimpleLocation
@Override @Override
public int hashCode() public int hashCode() {
{
int hash = 13; int hash = 13;
hash = 37 * hash + x; hash = 37 * hash + x;
hash = 31 * hash + y; hash = 31 * hash + y;

19
src/de/craftinc/gates/util/TextUtil.java
View File

@ -20,16 +20,13 @@ import org.bukkit.ChatColor;
import java.util.List; import java.util.List;
public class TextUtil public class TextUtil {
{ public static String titleize(String str) {
public static String titleize(String str)
{
String center = ".[ " + ChatColor.YELLOW + str + ChatColor.GOLD + " ]."; String center = ".[ " + ChatColor.YELLOW + str + ChatColor.GOLD + " ].";
if (center.length() >= 60) { if (center.length() >= 60) {
return ChatColor.GOLD + center; return ChatColor.GOLD + center;
} } else {
else {
String line = ChatColor.GOLD + repeat("_", 60); String line = ChatColor.GOLD + repeat("_", 60);
int pivot = line.length() / 2; int pivot = line.length() / 2;
@ -41,27 +38,25 @@ public class TextUtil
} }
public static String repeat(String s, int times) public static String repeat(String s, int times) {
{
if (times <= 0) if (times <= 0)
return ""; return "";
return s + repeat(s, times-1); return s + repeat(s, times - 1);
} }
/** /**
* Joins all elements of list into a single string, separating the original strings with glue. * Joins all elements of list into a single string, separating the original strings with glue.
*/ */
public static String implode(List<String> list, String glue) public static String implode(List<String> list, String glue) {
{
if (list.size() == 0) { if (list.size() == 0) {
return ""; return "";
} }
String ret = list.get(0); String ret = list.get(0);
for (int i=1; i<list.size(); i++) { for (int i = 1; i < list.size(); i++) {
ret += glue + list.get(i); ret += glue + list.get(i);
} }

38
src/de/craftinc/gates/util/VehicleCloner.java
View File

@ -20,10 +20,8 @@ import org.bukkit.Location;
import org.bukkit.entity.*; import org.bukkit.entity.*;
public class VehicleCloner public class VehicleCloner {
{ public static Vehicle clone(Vehicle parent, Location cloneLocation) {
public static Vehicle clone(Vehicle parent, Location cloneLocation)
{
Vehicle clone = cloneLocation.getWorld().spawn(cloneLocation, parent.getClass()); Vehicle clone = cloneLocation.getWorld().spawn(cloneLocation, parent.getClass());
clone.setFallDistance(parent.getFallDistance()); clone.setFallDistance(parent.getFallDistance());
@ -33,18 +31,17 @@ public class VehicleCloner
clone.setLastDamageCause(parent.getLastDamageCause()); clone.setLastDamageCause(parent.getLastDamageCause());
if (clone instanceof Boat) { if (clone instanceof Boat) {
Boat boat = (Boat)clone; Boat boat = (Boat) clone;
Boat parentBoat = (Boat)parent; Boat parentBoat = (Boat) parent;
boat.setMaxSpeed(parentBoat.getMaxSpeed()); boat.setMaxSpeed(parentBoat.getMaxSpeed());
boat.setOccupiedDeceleration(parentBoat.getOccupiedDeceleration()); boat.setOccupiedDeceleration(parentBoat.getOccupiedDeceleration());
boat.setUnoccupiedDeceleration(parentBoat.getUnoccupiedDeceleration()); boat.setUnoccupiedDeceleration(parentBoat.getUnoccupiedDeceleration());
boat.setWorkOnLand(parentBoat.getWorkOnLand()); boat.setWorkOnLand(parentBoat.getWorkOnLand());
boat.setVelocity(parentBoat.getVelocity()); boat.setVelocity(parentBoat.getVelocity());
} } else if (clone instanceof Animals) {
else if (clone instanceof Animals) { Animals animal = (Animals) clone;
Animals animal = (Animals)clone; Animals parentAnimal = (Animals) parent;
Animals parentAnimal = (Animals)parent;
animal.setMaxHealth(parentAnimal.getMaxHealth()); animal.setMaxHealth(parentAnimal.getMaxHealth());
animal.setHealth(parentAnimal.getMaxHealth()); animal.setHealth(parentAnimal.getMaxHealth());
@ -63,8 +60,8 @@ public class VehicleCloner
animal.setAgeLock(parentAnimal.getAgeLock()); animal.setAgeLock(parentAnimal.getAgeLock());
if (clone instanceof Horse) { if (clone instanceof Horse) {
Horse horse = (Horse)clone; Horse horse = (Horse) clone;
Horse parentHorse = (Horse)parent; Horse parentHorse = (Horse) parent;
horse.getInventory().setArmor(parentHorse.getInventory().getArmor()); horse.getInventory().setArmor(parentHorse.getInventory().getArmor());
horse.getInventory().setSaddle(parentHorse.getInventory().getSaddle()); horse.getInventory().setSaddle(parentHorse.getInventory().getSaddle());
@ -81,23 +78,20 @@ public class VehicleCloner
if (parentHorse.isAdult()) { if (parentHorse.isAdult()) {
horse.setAdult(); horse.setAdult();
} } else {
else {
horse.setBaby(); horse.setBaby();
} }
horse.setBreed(parentHorse.canBreed()); horse.setBreed(parentHorse.canBreed());
} } else if (clone instanceof Pig) {
else if (clone instanceof Pig) { Pig pig = (Pig) clone;
Pig pig = (Pig)clone; Pig parentPig = (Pig) parent;
Pig parentPig = (Pig)parent;
pig.setSaddle(parentPig.hasSaddle()); pig.setSaddle(parentPig.hasSaddle());
} }
} } else if (clone instanceof Minecart) {
else if (clone instanceof Minecart) { Minecart minecart = (Minecart) clone;
Minecart minecart = (Minecart)clone; Minecart parentMinecart = (Minecart) parent;
Minecart parentMinecart = (Minecart)parent;
minecart.setDerailedVelocityMod(parentMinecart.getDerailedVelocityMod()); minecart.setDerailedVelocityMod(parentMinecart.getDerailedVelocityMod());
minecart.setFlyingVelocityMod(parentMinecart.getFlyingVelocityMod()); minecart.setFlyingVelocityMod(parentMinecart.getFlyingVelocityMod());