JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Converted file encoding from ISO-8859-1 to UTF-8

Browse Source
This commit is contained in:
CoderTim 2014-05-25 19:42:39 -04:00
parent 3859a42f1d
commit c45e7d2a80
31 changed files with 75 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Plugins/.idea/encodings.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
<file url="file://$PROJECT_DIR$/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java" charset="UTF-8" />
</component>
</project>

2
Plugins/Core/src/me/chiss/Core/Loot/LootBase.java
View File

@ -192,7 +192,7 @@ public abstract class LootBase implements Listener
public ItemStack Get()
{
ItemStack loot = ItemStackFactory.Instance.CreateStack(_mat.getId(), (byte)0, 1, "§r" + ChatColor.RESET + C.mLoot +_name, _lore);
ItemStack loot = ItemStackFactory.Instance.CreateStack(_mat.getId(), (byte)0, 1, "§r" + ChatColor.RESET + C.mLoot +_name, _lore);
loot.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, _enchLevel);

12
Plugins/Core/src/me/chiss/Core/Modules/PointManager.java
View File

@ -251,7 +251,7 @@ public class PointManager extends AModule implements IScheduleListener
if (capped)
{
UtilPlayer.message(cur, "§c§lYou have already earned the max of " + _maxPPH + " Points today.");
UtilPlayer.message(cur, "§c§lYou have already earned the max of " + _maxPPH + " Points today.");
UtilPlayer.message(cur, F.value("You will earn more in:", UtilTime.convertString(Scheduler.Instance.GetTimeTilNextAppt(this), 1, TimeUnit.FIT)));
continue;
}
@ -281,14 +281,14 @@ public class PointManager extends AModule implements IScheduleListener
totalPoints = _maxPPH - _pointTotals.get(cur.getName());
}
UtilPlayer.message(cur, "§c§lOffline Point Reward - " + UtilTime.convertString(System.currentTimeMillis() - _quitMap.get(name), 1, TimeUnit.FIT));
UtilPlayer.message(cur, "§c§lOffline Point Reward - " + UtilTime.convertString(System.currentTimeMillis() - _quitMap.get(name), 1, TimeUnit.FIT));
UtilPlayer.message(cur, F.value("Clan Age", clanPoints + " Points"));
UtilPlayer.message(cur, F.value("Battle Pet", petPoints + " Points"));
UtilPlayer.message(cur, "You received " + F.count(totalPoints + " Points") + ".");
if (hitCap)
{
UtilPlayer.message(cur, "§c§lYou have already earned the max of " + _maxPPH + " Points today.");
UtilPlayer.message(cur, "§c§lYou have already earned the max of " + _maxPPH + " Points today.");
UtilPlayer.message(cur, F.value("You will earn more in:", UtilTime.convertString(Scheduler.Instance.GetTimeTilNextAppt(this), 1, TimeUnit.FIT)));
}
@ -331,7 +331,7 @@ public class PointManager extends AModule implements IScheduleListener
if (capped)
{
UtilPlayer.message(cur, "§c§lYou have already earned the max of " + _maxPPH + " Points today.");
UtilPlayer.message(cur, "§c§lYou have already earned the max of " + _maxPPH + " Points today.");
UtilPlayer.message(cur, F.value("You will earn more in:", UtilTime.convertString(Scheduler.Instance.GetTimeTilNextAppt(this), 1, TimeUnit.FIT)));
continue;
}
@ -366,7 +366,7 @@ public class PointManager extends AModule implements IScheduleListener
totalPoints = _maxPPH - _pointTotals.get(cur.getName());
}
UtilPlayer.message(cur, "§a§lOnline Point Reward - " + UtilTime.convertString(_interval, 1, TimeUnit.FIT));
UtilPlayer.message(cur, "§a§lOnline Point Reward - " + UtilTime.convertString(_interval, 1, TimeUnit.FIT));
UtilPlayer.message(cur, F.value("Online", onlinePoints + " Points"));
UtilPlayer.message(cur, F.value("NAC User", NACPoints + " Points"));
UtilPlayer.message(cur, F.value("Clan Age", clanPoints + " Points"));
@ -375,7 +375,7 @@ public class PointManager extends AModule implements IScheduleListener
if (hitCap)
{
UtilPlayer.message(cur, "§c§lYou have already earned the max of " + _maxPPH + " Points today.");
UtilPlayer.message(cur, "§c§lYou have already earned the max of " + _maxPPH + " Points today.");
UtilPlayer.message(cur, F.value("You will earn more in:", UtilTime.convertString(Scheduler.Instance.GetTimeTilNextAppt(this), 1, TimeUnit.FIT)));
}

4
Plugins/Core/src/me/chiss/Core/Server/command/ListCommand.java
View File

@ -43,10 +43,10 @@ public class ListCommand extends CommandBase<Server>
if (other.length() == 0) other = "None";
else other = other.substring(0, other.length() - 1);
UtilPlayer.message(caller, "§c§l" + "Staff");
UtilPlayer.message(caller, "§c§l" + "Staff");
UtilPlayer.message(caller, staff);
UtilPlayer.message(caller, "§a§l" + "Players");
UtilPlayer.message(caller, "§a§l" + "Players");
UtilPlayer.message(caller, other);
}
}

2
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java
View File

@ -12,7 +12,7 @@ public class MotdManager implements Listener, Runnable
private Plugin _plugin;
private MotdRepository _repository;
private String _motd = "§b§l§m §8§l§m[ §r §9§lMineplex§r §f§lGames§r §8§l§m ]§b§l§m §r §c§l§m§kZ§6§l§m§kZ§e§l§m§kZ§a§l§m§kZ§b§l§m§kZ§r §f§lPLAY NOW§r §b§l§m§kZ§a§l§m§kZ§e§l§m§kZ§6§l§m§kZ§c§l§m§kZ";
private String _motd = "§b§l§m §8§l§m[ §r §9§lMineplex§r §f§lGames§r §8§l§m ]§b§l§m §r §c§l§m§kZ§6§l§m§kZ§e§l§m§kZ§a§l§m§kZ§b§l§m§kZ§r §f§lPLAY NOW§r §b§l§m§kZ§a§l§m§kZ§e§l§m§kZ§6§l§m§kZ§c§l§m§kZ";
public MotdManager(Plugin plugin)
{

2
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdRepository.java
View File

@ -53,7 +53,7 @@ public class MotdRepository
public String retrieveMotd()
{
String motd = "§b§l§m §8§l§m[ §r §9§lMineplex§r §f§lGames§r §8§l§m ]§b§l§m §r §c§l§m§kZ§6§l§m§kZ§e§l§m§kZ§a§l§m§kZ§b§l§m§kZ§r §f§lPLAY NOW§r §b§l§m§kZ§a§l§m§kZ§e§l§m§kZ§6§l§m§kZ§c§l§m§kZ";
String motd = "§b§l§m §8§l§m[ §r §9§lMineplex§r §f§lGames§r §8§l§m ]§b§l§m §r §c§l§m§kZ§6§l§m§kZ§e§l§m§kZ§a§l§m§kZ§b§l§m§kZ§r §f§lPLAY NOW§r §b§l§m§kZ§a§l§m§kZ§e§l§m§kZ§6§l§m§kZ§c§l§m§kZ";
ResultSet resultSet = null;
PreparedStatement preparedStatement = null;

10
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/C.java
View File

@ -4,11 +4,11 @@ import org.bukkit.ChatColor;
public class C
{
public static String Scramble = "§k";
public static String Bold = "§l";
public static String Strike = "§m";
public static String Line = "§n";
public static String Italics = "§o";
public static String Scramble = "§k";
public static String Bold = "§l";
public static String Strike = "§m";
public static String Line = "§n";
public static String Italics = "§o";
public static String cAqua = "" + ChatColor.AQUA;
public static String cBlack = "" + ChatColor.BLACK;

6
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java
View File

@ -27,7 +27,7 @@ public class UtilServer
{
for (Player cur : getPlayers())
{
UtilPlayer.message(cur, "§b§l" + event);
UtilPlayer.message(cur, "§b§l" + event);
UtilPlayer.message(cur, message);
cur.playSound(cur.getLocation(), Sound.ORB_PICKUP, 2f, 0f);
cur.playSound(cur.getLocation(), Sound.ORB_PICKUP, 2f, 0f);
@ -36,12 +36,12 @@ public class UtilServer
public static void broadcast(String sender, String message)
{
broadcast("§f§l" + sender + " " + "§b" + message);
broadcast("§f§l" + sender + " " + "§b" + message);
}
public static void broadcastMagic(String sender, String message)
{
broadcast("§2§k" + message);
broadcast("§2§k" + message);
}
public static double getFilledPercent()

2
Plugins/Mineplex.Core/src/mineplex/core/itemstack/ItemStackFactory.java
View File

@ -44,7 +44,7 @@ public class ItemStackFactory extends MiniPlugin
private HashMap<Integer, HashMap<Byte, Entry<String, Boolean>>> _names;
private HashMap<Integer, HashMap<Byte, String[]>> _lores;
private String _nameFormat = "§r" + C.mItem;
private String _nameFormat = "§r" + C.mItem;
private HashSet<Listener> _statListeners = new HashSet<Listener>();

4
Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
View File

@ -112,7 +112,7 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
public void DoMessage(Player from, Player to, String message)
{
//Inform
UtilPlayer.message(from, C.cGold + "§l" + from.getName() + " > " + to.getName() + C.cYellow + " §l" + message);
UtilPlayer.message(from, C.cGold + "§l" + from.getName() + " > " + to.getName() + C.cYellow + " §l" + message);
//Save
Get(from).LastTo = to.getName();
@ -153,7 +153,7 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
to.playSound(to.getLocation(), Sound.NOTE_PIANO, 2f, 2f);
//Send
UtilPlayer.message(to, C.cGold + "§l" + from.getName() + " > " + to.getName() + C.cYellow + " §l" + message);
UtilPlayer.message(to, C.cGold + "§l" + from.getName() + " > " + to.getName() + C.cYellow + " §l" + message);
}
public void DoMessageAdmin(Player from, Player to, String message)

4
Plugins/Mineplex.Core/src/mineplex/core/shop/item/ShopItem.java
View File

@ -112,11 +112,11 @@ public class ShopItem extends CraftItemStack
{
if (_locked && !_displayItem)
{
this.getHandle().c(ChatColor.RED + "§l" + _name);
this.getHandle().c(ChatColor.RED + "§l" + _name);
}
else
{
this.getHandle().c(ChatColor.GREEN + "§l" + _name);
this.getHandle().c(ChatColor.GREEN + "§l" + _name);
}
}

10
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/page/CustomBuildPage.java
View File

@ -56,7 +56,7 @@ public class CustomBuildPage extends ShopPageBase<ClassShopManager, ClassCombatS
if (!Client.GetRank().Has(Rank.ULTRA) && !DonationManager.Get(Player.getName()).OwnsUnknownPackage("Competitive ULTRA"))
{
locked = true;
lockedText = new String[] { "§rGet Ultra rank to access this slot" };
lockedText = new String[] { "§rGet Ultra rank to access this slot" };
}
break;
case 3:
@ -65,7 +65,7 @@ public class CustomBuildPage extends ShopPageBase<ClassShopManager, ClassCombatS
if (!Client.GetRank().Has(Rank.ULTRA) && !DonationManager.Get(Player.getName()).OwnsUnknownPackage("Competitive ULTRA"))
{
locked = true;
lockedText = new String[] { "§rGet Ultra rank to access this slot" };
lockedText = new String[] { "§rGet Ultra rank to access this slot" };
}
break;
default:
@ -74,7 +74,7 @@ public class CustomBuildPage extends ShopPageBase<ClassShopManager, ClassCombatS
if (!Client.GetRank().Has(Rank.ULTRA) && !DonationManager.Get(Player.getName()).OwnsUnknownPackage("Competitive ULTRA"))
{
locked = true;
lockedText = new String[] { "§rGet Ultra rank to access this slot" };
lockedText = new String[] { "§rGet Ultra rank to access this slot" };
}
break;
}
@ -105,13 +105,13 @@ public class CustomBuildPage extends ShopPageBase<ClassShopManager, ClassCombatS
if (i != 0)
{
AddButton(slot + 18, new ShopItem(Material.ANVIL, "Edit Build", new String[] { }, 1, locked, true), new EditAndSaveCustomBuildButton(this, customBuild));
AddButton(slot + 36, new ShopItem(Material.FIRE, "Delete Build", new String[] { "§rIt will never come back..."}, 1, locked, true), new DeleteCustomBuildButton(this, customBuild));
AddButton(slot + 36, new ShopItem(Material.FIRE, "Delete Build", new String[] { "§rIt will never come back..."}, 1, locked, true), new DeleteCustomBuildButton(this, customBuild));
}
}
else
{
getInventory().setItem(slot + 18, new ShopItem(Material.ANVIL, "Edit Build", new String[] { }, 1, locked, true).getHandle());
getInventory().setItem(slot + 36, new ShopItem(Material.FIRE, "Delete Build", new String[] { "§rIt will never come back..."}, 1, locked, true).getHandle());
getInventory().setItem(slot + 36, new ShopItem(Material.FIRE, "Delete Build", new String[] { "§rIt will never come back..."}, 1, locked, true).getHandle());
}
slot += 2;

12
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
View File

@ -934,7 +934,7 @@ public abstract class Game implements Listener
UtilPlayer.message(player, "");
UtilPlayer.message(player, ArcadeFormat.Line);
UtilPlayer.message(player, "§aGame - §f§l" + this.GetName());
UtilPlayer.message(player, "§aGame - §f§l" + this.GetName());
UtilPlayer.message(player, "");
UtilPlayer.message(player, "");
@ -946,13 +946,13 @@ public abstract class Game implements Listener
}
else
{
UtilPlayer.message(player, ChatColor.WHITE + "§lNobody won the game...");
UtilPlayer.message(player, ChatColor.WHITE + "§lNobody won the game...");
}
UtilPlayer.message(player, _customWinLine);
UtilPlayer.message(player, "");
UtilPlayer.message(player, "§aMap - §f§l" + WorldData.MapName + C.cGray + " created by " + "§f§l" + WorldData.MapAuthor);
UtilPlayer.message(player, "§aMap - §f§l" + WorldData.MapName + C.cGray + " created by " + "§f§l" + WorldData.MapAuthor);
UtilPlayer.message(player, ArcadeFormat.Line);
}
@ -970,13 +970,13 @@ public abstract class Game implements Listener
UtilPlayer.message(player, "");
UtilPlayer.message(player, ArcadeFormat.Line);
UtilPlayer.message(player, "§aGame - §f§l" + this.GetName());
UtilPlayer.message(player, "§aGame - §f§l" + this.GetName());
UtilPlayer.message(player, "");
if (places == null || places.isEmpty())
{
UtilPlayer.message(player, "");
UtilPlayer.message(player, ChatColor.WHITE + "§lNobody won the game...");
UtilPlayer.message(player, ChatColor.WHITE + "§lNobody won the game...");
UtilPlayer.message(player, "");
}
else
@ -996,7 +996,7 @@ public abstract class Game implements Listener
}
UtilPlayer.message(player, "");
UtilPlayer.message(player, "§aMap - §f§l" + WorldData.MapName + C.cGray + " created by " + "§f§l" + WorldData.MapAuthor);
UtilPlayer.message(player, "§aMap - §f§l" + WorldData.MapName + C.cGray + " created by " + "§f§l" + WorldData.MapAuthor);
UtilPlayer.message(player, ArcadeFormat.Line);
}

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
View File

@ -210,7 +210,7 @@ public class GameTeam
public String GetFormattedName()
{
return GetColor() + "§l" + GetName();
return GetColor() + "§l" + GetName();
}
public void SpawnTeleport(Player player)

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java
View File

@ -962,11 +962,11 @@ public class Bridge extends TeamGame implements OreObsfucation
if (time > 0)
GetObjectiveSide().setDisplayName(
ChatColor.WHITE + "§lBridges in " + C.cGreen + "§l"
ChatColor.WHITE + "§lBridges in " + C.cGreen + "§l"
+ UtilTime.MakeStr(time));
else
GetObjectiveSide().setDisplayName(
ChatColor.WHITE + "§lBridges are down!");
ChatColor.WHITE + "§lBridges are down!");
}
@EventHandler(priority = EventPriority.LOW)

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/CastleSiege.java
View File

@ -822,12 +822,12 @@ public class CastleSiege extends TeamGame
if (timeLeft > 0)
GetObjectiveSide().setDisplayName(
ChatColor.WHITE + "§lSun Rise: " + C.cGreen + "§l"
ChatColor.WHITE + "§lSun Rise: " + C.cGreen + "§l"
+ UtilTime.MakeStr(timeLeft));
else
{
GetObjectiveSide().setDisplayName(
ChatColor.WHITE + "§lSun has risen!");
ChatColor.WHITE + "§lSun has risen!");
for (Player player : GetTeam(ChatColor.RED).GetPlayers(true))
Manager.GetCondition().Factory().Ignite("Sun Damage", player, player, 5, false, false);

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java
View File

@ -956,7 +956,7 @@ public class HideSeek extends TeamGame
if (timeLeft > 0)
{
GetObjectiveSide().setDisplayName(
ChatColor.WHITE + "§lHide Time: " + C.cGreen + "§l"
ChatColor.WHITE + "§lHide Time: " + C.cGreen + "§l"
+ UtilTime.MakeStr(timeLeft));
}
else
@ -981,13 +981,13 @@ public class HideSeek extends TeamGame
if (timeLeft > 0)
{
GetObjectiveSide().setDisplayName(
ChatColor.WHITE + "§lHunt Time: " + C.cGreen + "§l"
ChatColor.WHITE + "§lHunt Time: " + C.cGreen + "§l"
+ UtilTime.MakeStr(timeLeft));
}
else
{
GetObjectiveSide().setDisplayName(
ChatColor.WHITE + "§lHunt Time: " + C.cGreen + "§l"
ChatColor.WHITE + "§lHunt Time: " + C.cGreen + "§l"
+ UtilTime.MakeStr(0));
SetState(GameState.End);

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
View File

@ -186,7 +186,7 @@ public class MineWare extends SoloGame
Announce(C.cYellow + C.Bold + _order.GetOrder().toUpperCase());
GetObjectiveSide().setDisplayName(
ChatColor.WHITE + "§lMineWare " + C.cGreen + "§l"
ChatColor.WHITE + "§lMineWare " + C.cGreen + "§l"
+ "Round " + _orderCount);
}
//Update Order

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java
View File

@ -470,11 +470,11 @@ public class SheepGame extends TeamGame
if (time > 0)
GetObjectiveSide().setDisplayName(
ChatColor.WHITE + "§lTime Left " + C.cGreen + "§l"
ChatColor.WHITE + "§lTime Left " + C.cGreen + "§l"
+ UtilTime.MakeStr(time));
else
GetObjectiveSide().setDisplayName(
ChatColor.WHITE + "§lTime Up!");
ChatColor.WHITE + "§lTime Up!");
}
@Override

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
View File

@ -300,7 +300,7 @@ public class SuperSmash extends SoloGame
UtilPlayer.message(player, ArcadeFormat.Line);
UtilPlayer.message(player, "§aAbility - §f§l" + player.getItemInHand().getItemMeta().getDisplayName());
UtilPlayer.message(player, "§aAbility - §f§l" + player.getItemInHand().getItemMeta().getDisplayName());
//Perk Descs
for (String line : player.getItemInHand().getItemMeta().getLore())

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmashTeam.java
View File

@ -293,7 +293,7 @@ public class SuperSmashTeam extends TeamGame
UtilPlayer.message(player, ArcadeFormat.Line);
UtilPlayer.message(player, "§aAbility - §f§l" + player.getItemInHand().getItemMeta().getDisplayName());
UtilPlayer.message(player, "§aAbility - §f§l" + player.getItemInHand().getItemMeta().getDisplayName());
//Perk Descs
for (String line : player.getItemInHand().getItemMeta().getLore())

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
View File

@ -1210,13 +1210,13 @@ public class SurvivalGames extends SoloGame
if (timeLeft > 0)
{
GetObjectiveSide().setDisplayName(
ChatColor.WHITE + "§lDeathmatch: " + C.cGreen + "§l"
ChatColor.WHITE + "§lDeathmatch: " + C.cGreen + "§l"
+ UtilTime.MakeStr(timeLeft));
}
else
{
GetObjectiveSide().setDisplayName(
ChatColor.WHITE + "§lDeathmatch");
ChatColor.WHITE + "§lDeathmatch");
_deathmatchLive = true;

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesTeams.java
View File

@ -1214,13 +1214,13 @@ public class SurvivalGamesTeams extends TeamGame
if (timeLeft > 0)
{
GetObjectiveSide().setDisplayName(
ChatColor.WHITE + "§lDeathmatch: " + C.cGreen + "§l"
ChatColor.WHITE + "§lDeathmatch: " + C.cGreen + "§l"
+ UtilTime.MakeStr(timeLeft));
}
else
{
GetObjectiveSide().setDisplayName(
ChatColor.WHITE + "§lDeathmatch");
ChatColor.WHITE + "§lDeathmatch");
_deathmatchLive = true;

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
View File

@ -1114,7 +1114,7 @@ public class UHC extends TeamGame
}
else
{
UtilPlayer.message(player, ChatColor.WHITE + "§lNobody won the game...");
UtilPlayer.message(player, ChatColor.WHITE + "§lNobody won the game...");
}
UtilPlayer.message(player, "");
@ -1138,7 +1138,7 @@ public class UHC extends TeamGame
UtilPlayer.message(player, "");
UtilPlayer.message(player, "");
UtilPlayer.message(player, ChatColor.WHITE + "§lEnder Dragon has won the game...");
UtilPlayer.message(player, ChatColor.WHITE + "§lEnder Dragon has won the game...");
UtilPlayer.message(player, "");
UtilPlayer.message(player, "");

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
View File

@ -66,7 +66,7 @@ public abstract class Kit implements Listener
public String GetFormattedName()
{
return GetAvailability().GetColor() + "§l" + _kitName;
return GetAvailability().GetColor() + "§l" + _kitName;
}
public String GetName()
@ -163,7 +163,7 @@ public abstract class Kit implements Listener
UtilPlayer.message(player, ArcadeFormat.Line);
UtilPlayer.message(player, "§aKit - §f§l" + GetName());
UtilPlayer.message(player, "§aKit - §f§l" + GetName());
//Desc
for (String line : GetDesc())

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/SmashKit.java
View File

@ -25,7 +25,7 @@ public abstract class SmashKit extends Kit
UtilPlayer.message(player, ArcadeFormat.Line);
UtilPlayer.message(player, "§aKit - §f§l" + GetName());
UtilPlayer.message(player, "§aKit - §f§l" + GetName());
//Desc
for (String line : GetDesc())

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
View File

@ -186,7 +186,7 @@ public class GameGemManager implements Listener
UtilPlayer.message(player, "");
UtilPlayer.message(player, ArcadeFormat.Line);
UtilPlayer.message(player, "§aGame - §f§l" + game.GetName());
UtilPlayer.message(player, "§aGame - §f§l" + game.GetName());
UtilPlayer.message(player, "");
int earnedGems = 0;
@ -232,13 +232,13 @@ public class GameGemManager implements Listener
UtilPlayer.message(player, "");
if (give)
{
UtilPlayer.message(player, F.elem(C.cWhite + "§lYou now have " +
UtilPlayer.message(player, F.elem(C.cWhite + "§lYou now have " +
C.cGreen + C.Bold + (Manager.GetDonation().Get(player.getName()).GetGems() + earnedGems) + " Gems"));
}
else
{
UtilPlayer.message(player, F.elem(C.cWhite + "§lGame is still in progress..."));
UtilPlayer.message(player, F.elem(C.cWhite + "§lYou may earn more " + C.cGreen + C.Bold + "Gems" + C.cWhite + C.Bold + " when its completed."));
UtilPlayer.message(player, F.elem(C.cWhite + "§lGame is still in progress..."));
UtilPlayer.message(player, F.elem(C.cWhite + "§lYou may earn more " + C.cGreen + C.Bold + "Gems" + C.cWhite + C.Bold + " when its completed."));
}
UtilPlayer.message(player, ArcadeFormat.Line);

10
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
View File

@ -136,7 +136,7 @@ public class GameLobbyManager implements IPacketRunnable, Listener
_scoreboardMap.put(player, Bukkit.getScoreboardManager().getNewScoreboard());
Scoreboard scoreboard = _scoreboardMap.get(player);
Objective objective = scoreboard.registerNewObjective("§l" + "Lobby", "dummy");
Objective objective = scoreboard.registerNewObjective("§l" + "Lobby", "dummy");
objective.setDisplaySlot(DisplaySlot.SIDEBAR);
for (Rank rank : Rank.values())
@ -894,18 +894,18 @@ public class GameLobbyManager implements IPacketRunnable, Listener
for (Entry<Player, Scoreboard> entry : _scoreboardMap.entrySet())
{
Objective objective = entry.getValue().getObjective("§l" + "Lobby");
Objective objective = entry.getValue().getObjective("§l" + "Lobby");
if (Manager.GetGame() != null && Manager.GetGame().GetCountdown() >= 0)
{
if (Manager.GetGame().GetCountdown() > 0)
objective.setDisplayName(C.Bold + "§lStarting in " + C.cGreen + "§l" + Manager.GetGame().GetCountdown() + (Manager.GetGame().GetCountdown() == 1 ? " Second" : " Seconds"));
objective.setDisplayName(C.Bold + "§lStarting in " + C.cGreen + "§l" + Manager.GetGame().GetCountdown() + (Manager.GetGame().GetCountdown() == 1 ? " Second" : " Seconds"));
else if (Manager.GetGame().GetCountdown() == 0)
objective.setDisplayName(ChatColor.WHITE + "§lIn Progress...");
objective.setDisplayName(ChatColor.WHITE + "§lIn Progress...");
}
else
{
objective.setDisplayName(ChatColor.GREEN + "§l" + "Waiting for Players");
objective.setDisplayName(ChatColor.GREEN + "§l" + "Waiting for Players");
}
int line = 14;

6
Plugins/Nautilus.Game.PvP/src/nautilus/game/pvp/modules/Fishing/FishManager.java
View File

@ -402,7 +402,7 @@ public class FishManager extends AModule implements IScheduleListener
if (ath)
{
UtilServer.broadcast("§b§lNew Fishing All Time High -------------------");
UtilServer.broadcast("§b§lNew Fishing All Time High -------------------");
UtilServer.broadcast(F.name(player.getName()) + " caught a " +
ChatColor.GREEN + UtilMath.trim(1, weight) + " Pound " +
@ -626,7 +626,7 @@ public class FishManager extends AModule implements IScheduleListener
@Override
public void AppointmentFire()
{
UtilServer.broadcast("§b§lBest Catches of the Day @ " + UtilTime.date());
UtilServer.broadcast("§b§lBest Catches of the Day @ " + UtilTime.date());
double bestWeight = 0;
String best = C.cRed + "None";
@ -656,7 +656,7 @@ public class FishManager extends AModule implements IScheduleListener
if (!best.contains("None"))
{
UtilServer.broadcast("§b§lThe Best");
UtilServer.broadcast("§b§lThe Best");
UtilServer.broadcast(best);// + C.cDGreen + " 100,000 Coins");
}

4
Plugins/Nautilus.Game.PvP/src/nautilus/game/pvp/modules/Recipes.java
View File

@ -72,7 +72,7 @@ public class Recipes extends AModule
matName = "Diamond";
//Feedback
ItemStack result = ItemStackFactory.Instance.CreateStack(36, (byte)0, 1, "§r" + C.cGray + "Recipe changed for " + F.item(name) + ".",
ItemStack result = ItemStackFactory.Instance.CreateStack(36, (byte)0, 1, "§r" + C.cGray + "Recipe changed for " + F.item(name) + ".",
new String[] {C.cGray + "Use " + F.item(matName + " Blocks") + " instead of " + F.item(matName + " Ingots") + "."});
inv.setResult(result);
@ -104,7 +104,7 @@ public class Recipes extends AModule
//Feedback
ItemStack result = ItemStackFactory.Instance.CreateStack(36, (byte)0, 1,
"§r" + C.cGray + "Crafting of " + F.item(name) + " is disabled.", new String[] {});
"§r" + C.cGray + "Crafting of " + F.item(name) + " is disabled.", new String[] {});
inv.setResult(result);
}

8
Plugins/Nautilus.Game.PvP/src/nautilus/game/pvp/modules/ShopManager.java
View File

@ -35,10 +35,10 @@ public class ShopManager extends AModule
_donatorShop = new PvpDonatorShop((IPlugin)plugin, _repository, Clients(), Classes(), Skills());
_buildShop = new PvpBuildShop((IPlugin)plugin, _repository, Clients(), Classes(), Skills());
_combatShop = new PvpItemShop((IPlugin)plugin, _repository, Clients(), new PvpShopFactory(plugin, _repository, "pvp_shop_combat.dat"), "§4Blacksmith");
_blockShop = new PvpItemShop((IPlugin)plugin, _repository, Clients(), new PvpShopFactory(plugin, _repository, "pvp_shop_block.dat"), "§4Miner");
_itemShop = new PvpItemShop((IPlugin)plugin, _repository, Clients(), new PvpShopFactory(plugin, _repository, "pvp_shop_item.dat"), "§4Merchant");
new BenefitShop(benefitManager, "§4Benefactor", CurrencyType.Gems);
_combatShop = new PvpItemShop((IPlugin)plugin, _repository, Clients(), new PvpShopFactory(plugin, _repository, "pvp_shop_combat.dat"), "§4Blacksmith");
_blockShop = new PvpItemShop((IPlugin)plugin, _repository, Clients(), new PvpShopFactory(plugin, _repository, "pvp_shop_block.dat"), "§4Miner");
_itemShop = new PvpItemShop((IPlugin)plugin, _repository, Clients(), new PvpShopFactory(plugin, _repository, "pvp_shop_item.dat"), "§4Merchant");
new BenefitShop(benefitManager, "§4Benefactor", CurrencyType.Gems);
}
@Override