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

Clean up Imports / Methods Class

Browse source 
Removed the comments from the Methods class that weren't necessary and
cleaned up the imports throughout all of the classes.
This commit is contained in:
MistPhizzle 2014-07-27 11:41:54 -04:00
parent 3b5040d0cc
commit bad3c187a2
13 changed files with 1 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/com/projectkorra/ProjectKorra/Ability/AvatarState.java
View file

@ -5,7 +5,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect;

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

@ -5,8 +5,6 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;

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

@ -135,9 +135,6 @@ public class Methods {
}
public static void createBendingPlayer(UUID uuid, String player) {
/*
* This will run when the player logs in.
*/
ResultSet rs2 = DBConnection.sql.readQuery("SELECT * FROM pk_players WHERE uuid = '" + uuid.toString() + "'");
try {
if (!rs2.next()) { // Data doesn't exist, we want a completely new player.
@ -236,7 +233,6 @@ public class Methods {
File readFile = new File(".", "bendingPlayers.yml");
File writeFile = new File(".", "converted.yml");
if (readFile.exists()) {
// plugin.log.info("File exists");
try {
DataInputStream input = new DataInputStream(new FileInputStream(readFile));
BufferedReader reader = new BufferedReader(new InputStreamReader(input));
@ -639,9 +635,6 @@ public class Methods {
for (int y = yorg - r; y <= yorg + r; y++) {
for (int z = zorg - r; z <= zorg + r; z++) {
Block block = location.getWorld().getBlockAt(x, y, z);
// if
// (block.getLocation().distance(originblock.getLocation())
// <= radius) {
if (block.getLocation().distance(location) <= radius) {
blocks.add(block);
}
@ -663,21 +656,6 @@ public class Methods {
return false;
Material material = block.getType();
// if ((material == Material.STONE) || (material == Material.CLAY)
// || (material == Material.COAL_ORE)
// || (material == Material.DIAMOND_ORE)
// || (material == Material.DIRT)
// || (material == Material.GOLD_ORE)
// || (material == Material.GRASS)
// || (material == Material.GRAVEL)
// || (material == Material.IRON_ORE)
// || (material == Material.LAPIS_ORE)
// || (material == Material.NETHERRACK)
// || (material == Material.REDSTONE_ORE)
// || (material == Material.SAND)
// || (material == Material.SANDSTONE)) {
// return true;
// }
for (String s : ProjectKorra.plugin.getConfig().getStringList("Properties.Earth.EarthbendableBlocks")) {
if (material == Material.getMaterial(s)) {
@ -692,19 +670,6 @@ public class Methods {
public static boolean isChiBlocked(String player) {
return Methods.getBendingPlayer(player).isChiBlocked();
// long currTime = System.currentTimeMillis();
// long duration = ProjectKorra.plugin.getConfig().getLong("Abilities.Chi.Passive.BlockChi.Duration");
// if (BendingPlayer.blockedChi.contains(player)) {
// if (BendingPlayer.blockedChi.get(player) + ChiPassive.duration >= System.currentTimeMillis()) {
// return true;
// } else {
// BendingPlayer.blockedChi.remove(player);
// return false;
// }
// } else {
// Bukkit.getServer().broadcastMessage("test");
// return false;
// }
}
public static Vector rotateVectorAroundVector(Vector axis, Vector rotator,
@ -719,8 +684,6 @@ public class Methods {
return rotate.multiply(Math.cos(angle)).add(
thirdaxis.multiply(Math.sin(angle)));
// return new Vector(x, z, y);
}
public static Vector getOrthogonalVector(Vector axis, double degrees,
@ -916,18 +879,12 @@ public class Methods {
block,
getDrops(block, info.getState().getType(), info
.getState().getRawData(), pickaxe));
// ItemStack item = new ItemStack(info.getType());
// item.setData(new MaterialData(info.getType(),
// info.getData()));
// block.getWorld().dropItem(block.getLocation(), item);
tempair.remove(i);
} else {
info.setTime(info.getTime() + 10000);
}
return;
} else {
// block.setType(info.getType());
// block.setData(info.getData());
info.getState().update(true);
tempair.remove(i);
}
@ -945,10 +902,6 @@ public class Methods {
}
if (block.equals(sourceblock)) {
// verbose("Equals!");
// if (block.getType() == Material.SANDSTONE
// && info.getState().getType() == Material.SAND)
// block.setType(Material.SAND);
info.getState().update(true);
if (EarthColumn.blockInAllAffectedBlocks(sourceblock))
EarthColumn.revertBlock(sourceblock);
@ -964,62 +917,23 @@ public class Methods {
addTempAirBlock(block);
movedearth.remove(block);
return true;
// verbose("Block: " + block);
// verbose("Sourceblock: " + sourceblock);
// verbose("StartBlock: " + startblock);
// if (startblock != null) {
// if (startblock.equals(sourceblock)) {
// sourceblock.setType(info.getType());
// sourceblock.setData(info.getData());
// if (adjacentToThreeOrMoreSources(block)) {
// block.setType(Material.WATER);
// block.setData(full);
// } else {
// block.setType(Material.AIR);
// }
// movedearth.get(startblock).setInteger(10);
// if (EarthColumn
// .blockInAllAffectedBlocks(sourceblock))
// EarthColumn.revertBlock(sourceblock);
// if (EarthColumn.blockInAllAffectedBlocks(block))
// EarthColumn.revertBlock(block);
// EarthColumn.resetBlock(sourceblock);
// EarthColumn.resetBlock(block);
// movedearth.remove(block);
// return true;
// }
//
// } else {
// startblock = block;
// }
// revertBlock(sourceblock, startblock, true);
}
if (sourceblock.getType() == Material.AIR || sourceblock.isLiquid()) {
// sourceblock.setType(info.getType());
// sourceblock.setData(info.getData());
info.getState().update(true);
} else {
// if (info.getType() != Material.AIR) {
// ItemStack item = new ItemStack(info.getType());
// item.setData(new MaterialData(info.getType(), info
// .getData()));
// block.getWorld().dropItem(block.getLocation(), item);
dropItems(
block,
getDrops(block, info.getState().getType(), info
.getState().getRawData(), pickaxe));
// }
}
// if (info.getInteger() != 10) {
if (isAdjacentToThreeOrMoreSources(block)) {
block.setType(Material.WATER);
block.setData(full);
} else {
block.setType(Material.AIR);
}
// }
if (EarthColumn.blockInAllAffectedBlocks(sourceblock))
EarthColumn.revertBlock(sourceblock);
@ -1156,9 +1070,6 @@ public class Methods {
if (EarthPassive.isPassiveSand(block)) {
EarthPassive.revertSand(block);
}
// if (block.getType() == Material.SAND) {
// block.setType(Material.SANDSTONE);
// }
if (affectedblock == null)
return false;
@ -1194,17 +1105,12 @@ public class Methods {
breakBlock(affectedblock);
} else if (!affectedblock.isLiquid()
&& affectedblock.getType() != Material.AIR) {
// affectedblock.setType(Material.GLASS);
moveEarthBlock(affectedblock, topblock);
}
} else {
breakBlock(affectedblock);
}
// affectedblock.setType(block.getType());
// affectedblock.setData(block.getData());
//
// addTempEarthBlock(block, affectedblock);
moveEarthBlock(block, affectedblock);
block.getWorld().playEffect(block.getLocation(),
Effect.GHAST_SHOOT, 0, 4);
@ -1215,7 +1121,6 @@ public class Methods {
.add(negnorm.getX() * i, negnorm.getY() * i,
negnorm.getZ() * i).getBlock();
if (!isEarthbendable(player, affectedblock)) {
// verbose(affectedblock.getType());
if (down) {
if (isTransparentToEarthbending(player,
affectedblock)
@ -1224,31 +1129,17 @@ public class Methods {
moveEarthBlock(affectedblock, block);
}
}
// if (!Tools.adjacentToThreeOrMoreSources(block)
// && Tools.isWater(block)) {
// block.setType(Material.AIR);
// } else {
// byte full = 0x0;
// block.setType(Material.WATER);
// block.setData(full);
// }
break;
}
if (EarthPassive.isPassiveSand(affectedblock)) {
EarthPassive.revertSand(affectedblock);
}
// if (affectedblock.getType() == Material.SAND) {
// affectedblock.setType(Material.SANDSTONE);
// }
if (block == null) {
for (Block checkblock : blocks) {
tempnophysics.remove(checkblock);
}
return false;
}
// block.setType(affectedblock.getType());
// block.setData(affectedblock.getData());
// addTempEarthBlock(affectedblock, block);
moveEarthBlock(affectedblock, block);
block = affectedblock;
}
@ -1286,17 +1177,13 @@ public class Methods {
byte full = 0x0;
Information info;
if (movedearth.containsKey(source)) {
// verbose("Moving something already moved.");
info = movedearth.get(source);
info.setTime(System.currentTimeMillis());
movedearth.remove(source);
movedearth.put(target, info);
} else {
// verbose("Moving something for the first time.");
info = new Information();
info.setBlock(source);
// info.setType(source.getType());
// info.setData(source.getData());
info.setTime(System.currentTimeMillis());
info.setState(source.getState());
movedearth.put(target, info);
@ -1326,8 +1213,6 @@ public class Methods {
} else {
Information info = new Information();
info.setBlock(block);
// info.setType(block.getType());
// info.setData(block.getData());
info.setState(block.getState());
info.setTime(System.currentTimeMillis());
block.setType(Material.AIR);
@ -1491,26 +1376,12 @@ public class Methods {
Set<String> ignite = AbilityModuleManager.igniteabilities;
Set<String> explode = AbilityModuleManager.explodeabilities;
// List<Abilities> ignite = new ArrayList<Abilities>();
// ignite.add(Abilities.Blaze);
// List<Abilities> explode = new ArrayList<Abilities>();
// explode.add(Abilities.FireBlast);
// explode.add(Abilities.Lightning);
if (ability == null && allowharmless)
return false;
if (isHarmlessAbility(ability) && allowharmless)
return false;
// if (ignite.contains(ability)) {
// BlockIgniteEvent event = new BlockIgniteEvent(location.getBlock(),
// IgniteCause.FLINT_AND_STEEL, player);
// Bending.plugin.getServer().getPluginManager().callEvent(event);
// if (event.isCancelled())
// return false;
// event.setCancelled(true);
// }
PluginManager pm = Bukkit.getPluginManager();
Plugin wgp = pm.getPlugin("WorldGuard");

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

@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.GameMode;
import org.bukkit.Location;

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

@ -16,7 +16,6 @@ import com.projectkorra.ProjectKorra.Flight;
import com.projectkorra.ProjectKorra.Methods;
import com.projectkorra.ProjectKorra.ProjectKorra;
import com.projectkorra.ProjectKorra.Ability.AvatarState;
import com.projectkorra.ProjectKorra.Utilities.ParticleEffect;
public class AirBlast {

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

@ -3,7 +3,6 @@ package com.projectkorra.ProjectKorra.airbending;
import java.util.ArrayList;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;

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

@ -3,7 +3,6 @@ package com.projectkorra.ProjectKorra.airbending;
import java.util.ArrayList;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;

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

@ -4,7 +4,6 @@ import java.util.HashMap;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;

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

@ -3,7 +3,6 @@ package com.projectkorra.ProjectKorra.airbending;
import java.util.ArrayList;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;

4
src/com/projectkorra/ProjectKorra/airbending/AirSuction.java
View file

@ -23,8 +23,7 @@ public class AirSuction {
public static ConcurrentHashMap<Integer, AirSuction> instances = new ConcurrentHashMap<Integer, AirSuction>();
private static ConcurrentHashMap<String, Long> cooldowns = new ConcurrentHashMap<String, Long>();
private static ConcurrentHashMap<Player, Location> origins = new ConcurrentHashMap<Player, Location>();
// private static ConcurrentHashMap<Player, Long> timers = new
// ConcurrentHashMap<Player, Long>();
static final long soonesttime = config.getLong("Properties.GlobalCooldown");
static final double maxspeed = AirBlast.maxspeed;
@ -36,7 +35,6 @@ public class AirSuction {
private static double affectingradius = config.getDouble("Abilities.Air.AirSuction.Radius");
private static double pushfactor = config.getDouble("Abilities.Air.AirSuction.Push");
private static double originselectrange = 10;
// private static long interval = AirBlast.interval;
private Location location;
private Location origin;

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

@ -6,7 +6,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;

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

@ -3,7 +3,6 @@ package com.projectkorra.ProjectKorra.airbending;
import java.util.ArrayList;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.configuration.file.FileConfiguration;

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

@ -11,7 +11,6 @@ import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.util.Vector;
import com.projectkorra.ProjectKorra.BendingPlayer;
import com.projectkorra.ProjectKorra.Methods;
import com.projectkorra.ProjectKorra.ProjectKorra;
import com.projectkorra.ProjectKorra.Ability.AvatarState;