Change code style

This commit is contained in:
kaenganxt
2014-10-27 17:27:11 +01:00
parent a290afdb6a
commit 20f8a38df4
40 changed files with 2089 additions and 2355 deletions

View File

@@ -15,75 +15,76 @@ import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerToggleFlightEvent;
import org.bukkit.util.Vector;
public class Features implements Listener {
public enum Feature {
DOUBLE_JUMP(1);
private Feature(int id) {
this.featureId = id;
}
private final int featureId;
private static final HashMap<Integer, Feature> BY_ID = new HashMap<>();
public static Feature getById(Integer id)
{
public static Feature getById(Integer id) {
return BY_ID.get(id);
}
static {
for (Feature feature : values()) {
BY_ID.put(feature.featureId, feature);
}
}
}
public Features()
{
public Features() {
Bukkit.getPluginManager().registerEvents(this, AnuraCore.getInstance());
}
private final HashMap<Player, ArrayList<Feature>> playerFeatures = new HashMap<>();
private final HashMap<Player, Boolean> canDoubleJump = new HashMap<>();
private final HashMap<Player, HashMap<Feature, Boolean>> featureEnabled = new HashMap<>();
public void updateFeatures(Player P)
{
if(!mainLobby()) return;
public void updateFeatures(Player P) {
if (!mainLobby()) {
return;
}
try {
ResultSet rs = Core.getMySql().querySelect("SELECT featureId FROM coreFeatures WHERE playerId = (SELECT id FROM players WHERE uuid = '"+P.getUniqueId().toString()+"')");
ResultSet rs = Core.getMySql().querySelect("SELECT featureId FROM coreFeatures WHERE playerId = (SELECT id FROM players WHERE uuid = '" + P.getUniqueId().toString() + "')");
resetPlayerFeatures(P);
playerFeatures.put(P, new ArrayList<Feature>());
featureEnabled.put(P, new HashMap<Feature, Boolean>());
while(rs.next())
{
if(Feature.getById(rs.getInt("featureId")) != null)
{
while (rs.next()) {
if (Feature.getById(rs.getInt("featureId")) != null) {
this.addFeature(P, Feature.getById(rs.getInt("featureId")));
featureEnabled.get(P).put(Feature.DOUBLE_JUMP, true);
}
}
} catch (SQLException ex) {
System.err.println("Could not update player features because of a sql exception: "+ex.getLocalizedMessage());
System.err.println("Could not update player features because of a sql exception: " + ex.getLocalizedMessage());
}
}
public void updateFeaturesAll()
{
if(!mainLobby()) return;
for(Player P : Bukkit.getOnlinePlayers())
{
public void updateFeaturesAll() {
if (!mainLobby()) {
return;
}
for (Player P : Bukkit.getOnlinePlayers()) {
updateFeatures(P);
}
}
public void reset()
{
for(Player P : Bukkit.getOnlinePlayers())
{
public void reset() {
for (Player P : Bukkit.getOnlinePlayers()) {
this.resetPlayerFeatures(P);
}
}
public void disableFeature(Player P, Feature f) {
if(!mainLobby()) return;
if (!mainLobby()) {
return;
}
if (f == Feature.DOUBLE_JUMP) {
if (!hasFeature(P, f)) {
Core.statusMsg(P, "dont_have_dbl_jump", false);
@@ -97,9 +98,11 @@ public class Features implements Listener {
}
}
}
public void enableFeature(Player P, Feature f) {
if(!mainLobby()) return;
if (!mainLobby()) {
return;
}
if (f == Feature.DOUBLE_JUMP) {
if (!hasFeature(P, f)) {
Core.statusMsg(P, "dont_have_dbl_jump", false);
@@ -111,89 +114,88 @@ public class Features implements Listener {
Core.statusMsg(P, "dbl_jump_on", true);
}
}
public boolean hasFeature(Player P, Feature f)
{
if(!mainLobby()) return false;
if(playerFeatures.containsKey(P))
{
public boolean hasFeature(Player P, Feature f) {
if (!mainLobby()) {
return false;
}
if (playerFeatures.containsKey(P)) {
return playerFeatures.get(P).contains(f);
}
return false;
}
private void resetPlayerFeatures(Player P)
{
if(!playerFeatures.containsKey(P)) return;
for(Feature f : (ArrayList<Feature>)playerFeatures.get(P).clone())
{
private void resetPlayerFeatures(Player P) {
if (!playerFeatures.containsKey(P)) {
return;
}
for (Feature f : (ArrayList<Feature>) playerFeatures.get(P).clone()) {
removeFeature(P, f);
}
}
public void removeFeature(Player P, Feature f)
{
if(!mainLobby()) return;
if(playerFeatures.containsKey(P)) playerFeatures.get(P).remove(f);
if(f.equals(Feature.DOUBLE_JUMP))
{
if(!P.getGameMode().equals(GameMode.CREATIVE))
{
public void removeFeature(Player P, Feature f) {
if (!mainLobby()) {
return;
}
if (playerFeatures.containsKey(P)) {
playerFeatures.get(P).remove(f);
}
if (f.equals(Feature.DOUBLE_JUMP)) {
if (!P.getGameMode().equals(GameMode.CREATIVE)) {
P.setAllowFlight(false);
P.setFoodLevel(20);
}
this.canDoubleJump.put(P, false);
}
}
public void addFeature(Player P, Feature f)
{
if(!mainLobby()) return;
if(playerFeatures.containsKey(P) && !hasFeature(P, f)) playerFeatures.get(P).add(f);
if(f.equals(Feature.DOUBLE_JUMP))
{
public void addFeature(Player P, Feature f) {
if (!mainLobby()) {
return;
}
if (playerFeatures.containsKey(P) && !hasFeature(P, f)) {
playerFeatures.get(P).add(f);
}
if (f.equals(Feature.DOUBLE_JUMP)) {
P.setAllowFlight(true);
this.canDoubleJump.put(P, true);
}
}
private boolean mainLobby()
{
private boolean mainLobby() {
return AnuraCore.getInstance().getConfig().getBoolean("is-main-lobby");
}
@EventHandler
public void onPlayerMove(PlayerMoveEvent event)
{
if(!mainLobby()) return;
public void onPlayerMove(PlayerMoveEvent event) {
if (!mainLobby()) {
return;
}
Player P = event.getPlayer();
if(this.hasFeature(P, Feature.DOUBLE_JUMP))
{
if(this.canDoubleJump.containsKey(P) && !this.canDoubleJump.get(P) && ((Entity)P).isOnGround())
{
if (this.hasFeature(P, Feature.DOUBLE_JUMP)) {
if (this.canDoubleJump.containsKey(P) && !this.canDoubleJump.get(P) && ((Entity) P).isOnGround()) {
this.canDoubleJump.put(P, true);
P.setFoodLevel(20);
}
}
}
@EventHandler
public void onToggleFlight(PlayerToggleFlightEvent event)
{
if(!mainLobby()) return;
public void onToggleFlight(PlayerToggleFlightEvent event) {
if (!mainLobby()) {
return;
}
Player P = event.getPlayer();
if(this.hasFeature(P, Feature.DOUBLE_JUMP) && !P.getGameMode().equals(GameMode.CREATIVE))
{
if(this.canDoubleJump.containsKey(P) && this.canDoubleJump.get(P))
{
if (this.hasFeature(P, Feature.DOUBLE_JUMP) && !P.getGameMode().equals(GameMode.CREATIVE)) {
if (this.canDoubleJump.containsKey(P) && this.canDoubleJump.get(P)) {
this.canDoubleJump.put(P, false);
P.setFoodLevel(1);
Vector v = P.getLocation().getDirection();
P.setVelocity(v.multiply(new Vector(1,2,1)));
P.setVelocity(v.multiply(new Vector(1, 2, 1)));
P.setVelocity(P.getVelocity().setY(1));
}
else
{
} else {
Vector v = P.getVelocity();
P.setVelocity(v.setY(-0.4));
}