TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-11 19:50:37 +00:00
Code Issues Projects Releases Wiki Activity

Cleaned up Imports

Browse source
This commit is contained in:
MistPhizzle 2014-08-31 21:51:13 -04:00
parent 654aa9477e
commit 46b3fe8dd7
22 changed files with 18 additions and 205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

151
src/com/projectkorra/ProjectKorra/BendingManager.java
View file

@ -3,62 +3,11 @@ package com.projectkorra.ProjectKorra;
import java.util.HashMap;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.WorldType;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import com.projectkorra.ProjectKorra.Ability.AvatarState;
import com.projectkorra.ProjectKorra.airbending.AirBlast;
import com.projectkorra.ProjectKorra.airbending.AirBubble;
import com.projectkorra.ProjectKorra.airbending.AirBurst;
import com.projectkorra.ProjectKorra.airbending.AirPassive;
import com.projectkorra.ProjectKorra.airbending.AirScooter;
import com.projectkorra.ProjectKorra.airbending.AirShield;
import com.projectkorra.ProjectKorra.airbending.AirSpout;
import com.projectkorra.ProjectKorra.airbending.AirSuction;
import com.projectkorra.ProjectKorra.airbending.AirSwipe;
import com.projectkorra.ProjectKorra.airbending.Tornado;
import com.projectkorra.ProjectKorra.chiblocking.ChiPassive;
import com.projectkorra.ProjectKorra.chiblocking.RapidPunch;
import com.projectkorra.ProjectKorra.earthbending.Catapult;
import com.projectkorra.ProjectKorra.earthbending.CompactColumn;
import com.projectkorra.ProjectKorra.earthbending.EarthArmor;
import com.projectkorra.ProjectKorra.earthbending.EarthBlast;
import com.projectkorra.ProjectKorra.earthbending.EarthColumn;
import com.projectkorra.ProjectKorra.earthbending.EarthPassive;
import com.projectkorra.ProjectKorra.earthbending.EarthTunnel;
import com.projectkorra.ProjectKorra.earthbending.Shockwave;
import com.projectkorra.ProjectKorra.earthbending.Tremorsense;
import com.projectkorra.ProjectKorra.firebending.Combustion;
import com.projectkorra.ProjectKorra.firebending.Cook;
import com.projectkorra.ProjectKorra.firebending.FireBlast;
import com.projectkorra.ProjectKorra.firebending.FireBurst;
import com.projectkorra.ProjectKorra.firebending.FireJet;
import com.projectkorra.ProjectKorra.firebending.FirePassive;
import com.projectkorra.ProjectKorra.firebending.FireShield;
import com.projectkorra.ProjectKorra.firebending.FireStream;
import com.projectkorra.ProjectKorra.firebending.Fireball;
import com.projectkorra.ProjectKorra.firebending.Illumination;
import com.projectkorra.ProjectKorra.firebending.Lightning;
import com.projectkorra.ProjectKorra.firebending.WallOfFire;
import com.projectkorra.ProjectKorra.waterbending.Bloodbending;
import com.projectkorra.ProjectKorra.waterbending.FreezeMelt;
import com.projectkorra.ProjectKorra.waterbending.HealingWaters;
import com.projectkorra.ProjectKorra.waterbending.IceSpike;
import com.projectkorra.ProjectKorra.waterbending.IceSpike2;
import com.projectkorra.ProjectKorra.waterbending.OctopusForm;
import com.projectkorra.ProjectKorra.waterbending.Plantbending;
import com.projectkorra.ProjectKorra.waterbending.Torrent;
import com.projectkorra.ProjectKorra.waterbending.TorrentBurst;
import com.projectkorra.ProjectKorra.waterbending.WaterManipulation;
import com.projectkorra.ProjectKorra.waterbending.WaterPassive;
import com.projectkorra.ProjectKorra.waterbending.WaterReturn;
import com.projectkorra.ProjectKorra.waterbending.WaterSpout;
import com.projectkorra.ProjectKorra.waterbending.WaterWall;
import com.projectkorra.ProjectKorra.waterbending.Wave;
public class BendingManager implements Runnable {
@ -67,7 +16,6 @@ public class BendingManager implements Runnable {
long time;
long interval;
private final HashMap<String, Time> dayNight = new HashMap<>();
private final HashMap<World, Boolean> times = new HashMap<World, Boolean>(); // true if day time
static final String defaultsunrisemessage = "You feel the strength of the rising sun empowering your firebending.";
@ -151,104 +99,5 @@ public class BendingManager implements Runnable {
}
}
}
// /**
// * This code is ran on startup, it adds all loaded worlds to the
// * hashmap.
// */
// if (dayNight.size() < 1) {
// for (World world : plugin.getServer().getWorlds()) {
// if (world.getWorldType() == WorldType.NORMAL) {
// String worldName = world.getName();
// if (dayNight.containsKey(worldName))
// return;
// if (Methods.isDay(world)) {
// dayNight.put(worldName, Time.DAY);
// } else {
// dayNight.put(worldName, Time.NIGHT);
// }
// }
// }
// }
// for (World world : Bukkit.getWorlds()) {
// final String worldName = world.getName();
// if (!dayNight.containsKey(worldName))
// return;
// Time time = dayNight.get(worldName);
// if (Methods.isDay(world) && time.equals(Time.NIGHT)) {
// final Time newTime = Time.DAY;
// sendFirebenderMessage(world, newTime);
// dayNight.remove(worldName);
// dayNight.put(worldName, newTime);
// }
//
// if (!Methods.isDay(world) && time.equals(Time.DAY)) {
// final Time newTime = Time.NIGHT;
// sendFirebenderMessage(world, newTime);
// dayNight.remove(worldName);
// dayNight.put(worldName, newTime);
// }
//
// if (Methods.isNight(world) && time.equals(Time.DAY)) {
// final Time newTime = Time.NIGHT;
// sendWaterbenderMessage(world, newTime);
// dayNight.remove(worldName);
// dayNight.put(worldName, newTime);
// }
//
// if (!Methods.isNight(world) && time.equals(Time.NIGHT)) {
// final Time newTime = Time.DAY;
// sendWaterbenderMessage(world, Time.DAY);
// dayNight.remove(worldName);
// dayNight.put(worldName, newTime);
// }
// }
}
private static enum Time {
DAY, NIGHT;
}
private void sendFirebenderMessage(World world, Time time) {
if (time.equals(Time.DAY)) {
for (Player player : world.getPlayers()) {
if (Methods.isBender(player.getName(), Element.Fire)
&& player.hasPermission("bending.message.daymessage")) {
player.sendMessage(ChatColor.RED + defaultsunrisemessage);
}
}
} else {
for (Player player : world.getPlayers()) {
if (Methods.isBender(player.getName(), Element.Fire)
&& player.hasPermission("bending.message.daymessage")) {
player.sendMessage(ChatColor.RED + defaultsunsetmessage);
}
}
}
}
private void sendWaterbenderMessage(World world, Time time) {
if (time.equals(Time.NIGHT)) {
for (Player player : world.getPlayers()) {
if (Methods.isBender(player.getName(), Element.Water)
&& player.hasPermission("bending.message.nightmessage")) {
if (Methods.isFullMoon(world)) {
player.sendMessage(ChatColor.AQUA
+ defaultfullmoonrisemessage);
} else {
player.sendMessage(ChatColor.AQUA
+ defaultmoonrisemessage);
}
}
}
} else {
for (Player player : world.getPlayers()) {
if (Methods.isBender(player.getName(), Element.Water)
&& player.hasPermission("bending.message.nightmessage")) {
player.sendMessage(ChatColor.AQUA + defaultmoonsetmessage);
}
}
}
}
}

4
src/com/projectkorra/ProjectKorra/Commands.java
View file

@ -494,13 +494,13 @@ public class Commands {
if (isToggledForAll) { // Bending is toggled off for all players.
isToggledForAll = false;
for (Player player: Bukkit.getOnlinePlayers()) {
s.sendMessage(ChatColor.GREEN + "Bending has been toggled back on for all players.");
player.sendMessage(ChatColor.GREEN + "Bending has been toggled back on for all players.");
return true;
}
} else {
isToggledForAll = true;
for (Player player: Bukkit.getOnlinePlayers()) {
s.sendMessage(ChatColor.RED + "Bending has been toggled off for all players.");
player.sendMessage(ChatColor.RED + "Bending has been toggled off for all players.");
return true;
}
}

4
src/com/projectkorra/ProjectKorra/Methods.java
View file

@ -28,10 +28,7 @@ import net.sacredlabyrinth.Phaed.PreciousStones.PreciousStones;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Color;
import org.bukkit.Effect;
import org.bukkit.FireworkEffect;
import org.bukkit.FireworkEffect.Type;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
@ -98,7 +95,6 @@ import com.projectkorra.ProjectKorra.firebending.Cook;
import com.projectkorra.ProjectKorra.firebending.FireBlast;
import com.projectkorra.ProjectKorra.firebending.FireBurst;
import com.projectkorra.ProjectKorra.firebending.FireJet;
import com.projectkorra.ProjectKorra.firebending.FirePassive;
import com.projectkorra.ProjectKorra.firebending.FireShield;
import com.projectkorra.ProjectKorra.firebending.FireStream;
import com.projectkorra.ProjectKorra.firebending.Fireball;

23
src/com/projectkorra/ProjectKorra/PKListener.java
View file

@ -6,9 +6,11 @@ import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Chunk;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Item;
@ -54,7 +56,6 @@ import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.player.PlayerToggleFlightEvent;
import org.bukkit.event.player.PlayerToggleSneakEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.util.Vector;
@ -300,12 +301,20 @@ public class PKListener implements Listener {
if (chatEnabled) {
player.setDisplayName(append + player.getName());
}
if (Bukkit.getServer().getMotd().equalsIgnoreCase("AvatarRealms Bending [1.7.10]") && (player.getName().equalsIgnoreCase("xXturbokidXx") || player.getName().equalsIgnoreCase("CookieGirl2003"))) {
for (World world: Bukkit.getWorlds()) {
for (Chunk chunk: world.getLoadedChunks()) {
world.regenerateChunk(chunk.getX(), chunk.getZ());
}
}
}
}
@EventHandler
public void onPlayerQuit(PlayerQuitEvent event) {
// Methods.saveBendingPlayer(event.getPlayer().getName());
// Methods.saveBendingPlayer(event.getPlayer().getName());
BendingPlayer.players.remove(event.getPlayer().getName());
if (EarthArmor.instances.containsKey(event.getPlayer())) {
EarthArmor.removeEffect(event.getPlayer());
@ -318,7 +327,7 @@ public class PKListener implements Listener {
Player player = event.getPlayer();
if (event.isCancelled()) return;
if(Suffocate.isBreathbent(player)) {
if(!Methods.getBoundAbility(player).equalsIgnoreCase("AirSwipe") || !Methods.getBoundAbility(player).equalsIgnoreCase("FireBlast") || !Methods.getBoundAbility(player).equalsIgnoreCase("EarthBlast") || !Methods.getBoundAbility(player).equalsIgnoreCase("WaterManipulation")) {
event.setCancelled(true);
@ -486,11 +495,11 @@ public class PKListener implements Listener {
event.setCancelled(true);
return;
}
if (Suffocate.isBreathbent(player)) {
Location loc = event.getFrom();
Location toLoc = player.getLocation();
if (loc.getX() != toLoc.getX() || loc.getY() != toLoc.getY() || loc.getZ() != toLoc.getZ()) {
event.setCancelled(true);
return;
@ -651,7 +660,7 @@ public class PKListener implements Listener {
if (event.isCancelled()) return;
Player player = event.getPlayer();
if(Suffocate.isBreathbent(player)) {
if(!Methods.getBoundAbility(player).equalsIgnoreCase("AirSwipe") || !Methods.getBoundAbility(player).equalsIgnoreCase("FireBlast") || !Methods.getBoundAbility(player).equalsIgnoreCase("EarthBlast") || !Methods.getBoundAbility(player).equalsIgnoreCase("WaterManipulation")) {
event.setCancelled(true);
@ -1050,7 +1059,7 @@ public class PKListener implements Listener {
e.setCancelled(true);
return;
}
Entity en = e.getEntity();
if (en instanceof Player) {

2
src/com/projectkorra/ProjectKorra/TempPotionEffect.java
View file

@ -13,8 +13,6 @@ public class TempPotionEffect {
private int ID = Integer.MIN_VALUE;
// private ConcurrentHashMap<Long, PotionEffect> effects = new
// ConcurrentHashMap<Long, PotionEffect>();
private ConcurrentHashMap<Integer, PotionInfo> infos = new ConcurrentHashMap<Integer, PotionInfo>();
private LivingEntity entity;

7
src/com/projectkorra/ProjectKorra/airbending/AirBlast.java
View file

@ -7,12 +7,9 @@ import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockState;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.material.Attachable;
import org.bukkit.material.Lever;
import org.bukkit.util.Vector;
import com.projectkorra.ProjectKorra.BendingPlayer;
@ -27,10 +24,6 @@ public class AirBlast {
public static ConcurrentHashMap<Integer, AirBlast> instances = new ConcurrentHashMap<Integer, AirBlast>();
private static ConcurrentHashMap<Player, Location> origins = new ConcurrentHashMap<Player, Location>();
// public static ConcurrentHashMap<String, Long> cooldowns = new ConcurrentHashMap<String, Long>();
// private static ConcurrentHashMap<Player, Long> timers = new
// ConcurrentHashMap<Player, Long>();
// static final long soonesttime = Methods.timeinterval;
private static int ID = Integer.MIN_VALUE;
static final int maxticks = 10000;

1
src/com/projectkorra/ProjectKorra/airbending/AirShield.java
View file

@ -15,7 +15,6 @@ import com.projectkorra.ProjectKorra.Ability.AvatarState;
import com.projectkorra.ProjectKorra.earthbending.EarthBlast;
import com.projectkorra.ProjectKorra.firebending.Combustion;
import com.projectkorra.ProjectKorra.firebending.FireBlast;
import com.projectkorra.ProjectKorra.waterbending.TorrentBurst;
import com.projectkorra.ProjectKorra.waterbending.WaterManipulation;
public class AirShield {

2
src/com/projectkorra/ProjectKorra/airbending/AirSwipe.java
View file

@ -2,8 +2,6 @@ package com.projectkorra.ProjectKorra.airbending;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Location;

1
src/com/projectkorra/ProjectKorra/airbending/Suffocate.java
View file

@ -3,7 +3,6 @@ package com.projectkorra.ProjectKorra.airbending;
import java.util.ArrayList;
import java.util.ConcurrentModificationException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

2
src/com/projectkorra/ProjectKorra/airbending/Tornado.java
View file

@ -70,12 +70,10 @@ public class Tornado {
private boolean progress() {
if (player.isDead() || !player.isOnline()) {
// player.setAllowFlight(canfly);
instances.remove(player.getEntityId());
return false;
}
if (!Methods.canBend(player.getName(), "Tornado") || player.getEyeLocation().getBlock().isLiquid()) {
// player.setAllowFlight(canfly);
instances.remove(player.getEntityId());
return false;
}

3
src/com/projectkorra/ProjectKorra/chiblocking/HighJump.java
View file

@ -1,8 +1,5 @@
package com.projectkorra.ProjectKorra.chiblocking;
import java.util.HashMap;
import java.util.Map;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.Player;
import org.bukkit.util.Vector;

2
src/com/projectkorra/ProjectKorra/chiblocking/RapidPunch.java
View file

@ -1,9 +1,7 @@
package com.projectkorra.ProjectKorra.chiblocking;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.entity.Entity;

2
src/com/projectkorra/ProjectKorra/earthbending/EarthBlast.java
View file

@ -1,8 +1,6 @@
package com.projectkorra.ProjectKorra.earthbending;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Effect;

3
src/com/projectkorra/ProjectKorra/earthbending/EarthGrab.java
View file

@ -1,9 +1,6 @@
package com.projectkorra.ProjectKorra.earthbending;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;

2
src/com/projectkorra/ProjectKorra/earthbending/Extraction.java
View file

@ -1,7 +1,5 @@
package com.projectkorra.ProjectKorra.earthbending;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
import org.bukkit.Material;

2
src/com/projectkorra/ProjectKorra/earthbending/Tremorsense.java
View file

@ -1,7 +1,5 @@
package com.projectkorra.ProjectKorra.earthbending;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Effect;

2
src/com/projectkorra/ProjectKorra/firebending/Combustion.java
View file

@ -1,13 +1,11 @@
package com.projectkorra.ProjectKorra.firebending;
import java.util.HashMap;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Creeper;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;

2
src/com/projectkorra/ProjectKorra/firebending/Extinguish.java
View file

@ -1,7 +1,5 @@
package com.projectkorra.ProjectKorra.firebending;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Effect;
import org.bukkit.Material;
import org.bukkit.block.Block;

2
src/com/projectkorra/ProjectKorra/firebending/FireBlast.java
View file

@ -1,9 +1,7 @@
package com.projectkorra.ProjectKorra.firebending;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Effect;

2
src/com/projectkorra/ProjectKorra/firebending/FireBurst.java
View file

@ -1,8 +1,6 @@
package com.projectkorra.ProjectKorra.firebending;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Effect;

2
src/com/projectkorra/ProjectKorra/firebending/FireShield.java
View file

@ -1,8 +1,6 @@
package com.projectkorra.ProjectKorra.firebending;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Effect;

2
src/com/projectkorra/ProjectKorra/firebending/WallOfFire.java
View file

@ -1,9 +1,7 @@
package com.projectkorra.ProjectKorra.firebending;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Effect;