diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/util/player')
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/player/PlayerCache.java | 16 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/player/PlayerUtils.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/player/UtilsMining.java | 18 |
3 files changed, 18 insertions, 18 deletions
diff --git a/src/Java/gtPlusPlus/core/util/player/PlayerCache.java b/src/Java/gtPlusPlus/core/util/player/PlayerCache.java index c397e0f12f..5d4581910c 100644 --- a/src/Java/gtPlusPlus/core/util/player/PlayerCache.java +++ b/src/Java/gtPlusPlus/core/util/player/PlayerCache.java @@ -3,8 +3,8 @@ package gtPlusPlus.core.util.player; import java.io.*; import java.util.*; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; @@ -18,12 +18,12 @@ public class PlayerCache { if (cache != null){ CORE.PlayerCache = PlayerCache.readPropertiesFileAsMap(); - Utils.LOG_INFO("Loaded PlayerCache.dat"); + Logger.INFO("Loaded PlayerCache.dat"); } } catch (final Exception e) { - Utils.LOG_INFO("Failed to initialise PlayerCache.dat"); + Logger.INFO("Failed to initialise PlayerCache.dat"); PlayerCache.createPropertiesFile("PLAYER_", "DATA"); //e.printStackTrace(); } @@ -36,7 +36,7 @@ public class PlayerCache { props.setProperty(playerName+" ", playerUUIDasString); final OutputStream out = new FileOutputStream(cache); props.store(out, "Player Cache."); - Utils.LOG_INFO("PlayerCache.dat created for future use."); + Logger.INFO("PlayerCache.dat created for future use."); out.close(); } catch (final Exception e ) { @@ -71,11 +71,11 @@ public class PlayerCache { oos.writeObject(playerInfo); oos.close(); fos.close(); - Utils.LOG_INFO("Serialized Player data saved in PlayerCache.dat"); + Logger.INFO("Serialized Player data saved in PlayerCache.dat"); } catch (final IOException e) { - Utils.LOG_INFO("No PlayerCache file found, creating one."); + Logger.INFO("No PlayerCache file found, creating one."); createPropertiesFile(playerName, playerUUIDasString); } } @@ -136,11 +136,11 @@ public class PlayerCache { return null; }catch(final ClassNotFoundException c) { - Utils.LOG_INFO("Class not found"); + Logger.INFO("Class not found"); c.printStackTrace(); return null; } - Utils.LOG_WARNING("Deserialized PlayerCache.."); + Logger.WARNING("Deserialized PlayerCache.."); return map; } diff --git a/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java b/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java index 306e3ca6b5..32488f074d 100644 --- a/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java +++ b/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java @@ -24,7 +24,7 @@ public class PlayerUtils { final List<EntityPlayer> i = new ArrayList<>(); final Iterator<EntityPlayerMP> iterator = MinecraftServer.getServer().getConfigurationManager().playerEntityList.iterator(); while (iterator.hasNext()) { - i.add((EntityPlayer) (iterator.next())); + i.add((iterator.next())); } for (final EntityPlayer temp : i) { if (temp.getDisplayName().toLowerCase().equals(name.toLowerCase())){ diff --git a/src/Java/gtPlusPlus/core/util/player/UtilsMining.java b/src/Java/gtPlusPlus/core/util/player/UtilsMining.java index d52dd7ee88..4f0402a18e 100644 --- a/src/Java/gtPlusPlus/core/util/player/UtilsMining.java +++ b/src/Java/gtPlusPlus/core/util/player/UtilsMining.java @@ -1,6 +1,6 @@ package gtPlusPlus.core.util.player; -import gtPlusPlus.core.util.Utils; +import gtPlusPlus.api.objects.Logger; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -35,7 +35,7 @@ public class UtilsMining { } else { - Utils.LOG_WARNING("Incorrect Tool for mining this block."); + Logger.WARNING("Incorrect Tool for mining this block."); } } } catch (final NullPointerException e){ @@ -179,29 +179,29 @@ public class UtilsMining { try { blockClass = block.getClass().toString().toLowerCase(); - Utils.LOG_WARNING(blockClass); + Logger.WARNING(blockClass); if (blockClass.toLowerCase().contains(LIQUID)){ - Utils.LOG_WARNING(block.toString()+" is a Liquid."); + Logger.WARNING(block.toString()+" is a Liquid."); return false; } else if (blockClass.toLowerCase().contains(ORE)){ - Utils.LOG_WARNING(block.toString()+" is an Ore."); + Logger.WARNING(block.toString()+" is an Ore."); return true; } else if (block.getHarvestLevel(world.getBlockMetadata(xyz[0], xyz[1], xyz[2])) >= miningLevel){ - Utils.LOG_WARNING(block.toString()+" is minable."); + Logger.WARNING(block.toString()+" is minable."); return true; } else if (blockClass.toLowerCase().contains(AIR)){ - Utils.LOG_WARNING(block.toString()+" is Air."); + Logger.WARNING(block.toString()+" is Air."); return false; } else if (blockClass.toLowerCase().contains(BLOCK)){ - Utils.LOG_WARNING(block.toString()+" is a block of some kind."); + Logger.WARNING(block.toString()+" is a block of some kind."); return false; } else { - Utils.LOG_WARNING(block.toString()+" is mystery."); + Logger.WARNING(block.toString()+" is mystery."); return false; } } |