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

Fixes and changes

Browse Source
This commit is contained in:
Shaun Bennett 2015-07-14 01:57:53 -05:00
parent 5c5e7dd4a9
commit ae71de30db
7 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plugins/.idea/codeStyleSettings.xml
View File

@ -37,6 +37,7 @@
</codeStyleSettings> </codeStyleSettings>
</value> </value>
</option> </option>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Mineplex" /> <option name="PREFERRED_PROJECT_CODE_STYLE" value="Mineplex" />
</component> </component>
</project> </project>

2
Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
View File

@ -71,7 +71,7 @@ public class TimeCommand extends CommandBase<StatsManager>
else else
{ {
int time = Plugin.Get(target).getStat("Global.TimeInGame"); int time = Plugin.Get(target).getStat("Global.TimeInGame");
UtilPlayer.message(caller, F.main("Time", F.name(target.getName() + " has spent " + F.elem(UtilTime.convertString(time * 1000L, 1, UtilTime.TimeUnit.FIT)) + " in game"))); UtilPlayer.message(caller, F.main("Time", F.name(target.getName()) + " has spent " + F.elem(UtilTime.convertString(time * 1000L, 1, UtilTime.TimeUnit.FIT)) + " in game"));
} }
} }
} }

10
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
View File

@ -8,6 +8,7 @@ import org.bukkit.plugin.java.JavaPlugin;
import net.minecraft.server.v1_7_R4.MinecraftServer; import net.minecraft.server.v1_7_R4.MinecraftServer;
import mineplex.core.account.CoreClientManager; import mineplex.core.account.CoreClientManager;
import mineplex.core.achievement.AchievementManager;
import mineplex.core.antihack.AntiHack; import mineplex.core.antihack.AntiHack;
import mineplex.core.blockrestore.BlockRestore; import mineplex.core.blockrestore.BlockRestore;
import mineplex.core.chat.Chat; import mineplex.core.chat.Chat;
@ -15,6 +16,7 @@ import mineplex.core.command.CommandCenter;
import mineplex.core.donation.DonationManager; import mineplex.core.donation.DonationManager;
import mineplex.core.explosion.Explosion; import mineplex.core.explosion.Explosion;
import mineplex.core.friend.FriendManager; import mineplex.core.friend.FriendManager;
import mineplex.core.give.Give;
import mineplex.core.ignore.IgnoreManager; import mineplex.core.ignore.IgnoreManager;
import mineplex.core.inventory.InventoryManager; import mineplex.core.inventory.InventoryManager;
import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.itemstack.ItemStackFactory;
@ -28,6 +30,7 @@ import mineplex.core.punish.Punish;
import mineplex.core.recharge.Recharge; import mineplex.core.recharge.Recharge;
import mineplex.core.serverConfig.ServerConfiguration; import mineplex.core.serverConfig.ServerConfiguration;
import mineplex.core.spawn.Spawn; import mineplex.core.spawn.Spawn;
import mineplex.core.stats.StatsManager;
import mineplex.core.status.ServerStatusManager; import mineplex.core.status.ServerStatusManager;
import mineplex.core.teleport.Teleport; import mineplex.core.teleport.Teleport;
import mineplex.core.updater.FileUpdater; import mineplex.core.updater.FileUpdater;
@ -80,7 +83,8 @@ public class Clans extends JavaPlugin
// TODO: Add spawn locations to a configuration file of some sort? // TODO: Add spawn locations to a configuration file of some sort?
Spawn spawn = new Spawn(this, serverStatusManager.getCurrentServerName()); Spawn spawn = new Spawn(this, serverStatusManager.getCurrentServerName());
Give.Initialize(this);
Teleport teleport = new Teleport(this); Teleport teleport = new Teleport(this);
Portal portal = new Portal(this, _clientManager, serverStatusManager.getCurrentServerName()); Portal portal = new Portal(this, _clientManager, serverStatusManager.getCurrentServerName());
new FileUpdater(this, portal, serverStatusManager.getCurrentServerName(), serverStatusManager.getRegion()); new FileUpdater(this, portal, serverStatusManager.getCurrentServerName(), serverStatusManager.getRegion());
@ -92,7 +96,9 @@ public class Clans extends JavaPlugin
BlockRestore blockRestore = new BlockRestore(this); BlockRestore blockRestore = new BlockRestore(this);
IgnoreManager ignoreManager = new IgnoreManager(this, _clientManager, preferenceManager, portal); IgnoreManager ignoreManager = new IgnoreManager(this, _clientManager, preferenceManager, portal);
Chat chat = new Chat(this, _clientManager, preferenceManager, serverStatusManager.getCurrentServerName()); StatsManager statsManager = new StatsManager(this, _clientManager);
AchievementManager achievementManager = new AchievementManager(statsManager, _clientManager, _donationManager);
Chat chat = new Chat(this, _clientManager, preferenceManager, achievementManager, serverStatusManager.getCurrentServerName());
new MessageManager(this, _clientManager, preferenceManager, ignoreManager, punish, new FriendManager(this, _clientManager, preferenceManager, portal), chat); new MessageManager(this, _clientManager, preferenceManager, ignoreManager, punish, new FriendManager(this, _clientManager, preferenceManager, portal), chat);
new MemoryFix(this); new MemoryFix(this);

9
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDisplay.java
View File

@ -7,6 +7,7 @@ import mineplex.core.common.util.C;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTextMiddle;
import mineplex.core.common.util.UtilWorld; import mineplex.core.common.util.UtilWorld;
import mineplex.core.recharge.Recharge; import mineplex.core.recharge.Recharge;
import mineplex.core.updater.UpdateType; import mineplex.core.updater.UpdateType;
@ -104,8 +105,7 @@ public class ClansDisplay extends MiniPlugin
String ownerString = C.xWilderness + "Wilderness"; String ownerString = C.xWilderness + "Wilderness";
ClanTerritory claim = Clans.getClanUtility().getClaim(player.getLocation()); ClanTerritory claim = Clans.getClanUtility().getClaim(player.getLocation());
String append = ""; if (claim != null)
if (claim != null)
{ {
//Relation //Relation
ClanRelation relation = Clans.getClanUtility().relPT(player.getName(), claim.Chunk); ClanRelation relation = Clans.getClanUtility().relPT(player.getName(), claim.Chunk);
@ -115,10 +115,11 @@ public class ClansDisplay extends MiniPlugin
//Trust //Trust
if (relation == ClanRelation.ALLY_TRUST) if (relation == ClanRelation.ALLY_TRUST)
append = C.mBody + "(" + C.mElem + "Trusted" + C.mBody + ")"; ownerString += " " + C.mBody + "(" + C.mElem + "Trusted" + C.mBody + ")";
} }
UtilPlayer.message(player, F.main("Clans", ownerString + " " + append)); UtilTextMiddle.display("", ownerString, 0, 25, 10, player);
UtilPlayer.message(player, F.main("Clans", ownerString));
} }
public int width = 8; public int width = 8;

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
View File

@ -138,7 +138,8 @@ public class ClansManager extends MiniClientPlugin<ClientClan> implements IRelat
PacketHandler packetHandler = new PacketHandler(plugin); PacketHandler packetHandler = new PacketHandler(plugin);
DisguiseManager disguiseManager = new DisguiseManager(plugin, packetHandler); DisguiseManager disguiseManager = new DisguiseManager(plugin, packetHandler);
Creature creature = new Creature(plugin); Creature creature = new Creature(plugin);
DamageManager damageManager = new DamageManager(plugin, _combatManager, new NpcManager(plugin, creature), disguiseManager); _condition = new SkillConditionManager(plugin);
DamageManager damageManager = new DamageManager(plugin, _combatManager, new NpcManager(plugin, creature), disguiseManager, _condition);
_worldEvent = new WorldEventManager(plugin, this, damageManager, lootManager, blockRestore); _worldEvent = new WorldEventManager(plugin, this, damageManager, lootManager, blockRestore);
_scoreboard = new ClansScoreboardManager(plugin, this, _warManager, _worldEvent, clientManager, donationManager); _scoreboard = new ClansScoreboardManager(plugin, this, _warManager, _worldEvent, clientManager, donationManager);
@ -154,7 +155,6 @@ public class ClansManager extends MiniClientPlugin<ClientClan> implements IRelat
Energy energy = new Energy(plugin); Energy energy = new Energy(plugin);
// TODO: Re-enable customtagfix with NCP update? // TODO: Re-enable customtagfix with NCP update?
//new CustomTagFix(plugin, packetHandler); //new CustomTagFix(plugin, packetHandler);
_condition = new SkillConditionManager(plugin);
new Field(plugin, creature, _condition, energy, serverName); new Field(plugin, creature, _condition, energy, serverName);

2
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/economy/GoldToken.java
View File

@ -18,7 +18,7 @@ public class GoldToken extends CustomItem
public GoldToken(int goldValue) public GoldToken(int goldValue)
{ {
super("Gold Token", null, Material.GOLD_INGOT); super("Gold Token", null, Material.GOLD_RECORD);
_goldValue = goldValue; _goldValue = goldValue;
} }

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/bank/BankPage.java
View File

@ -103,7 +103,7 @@ public class BankPage extends ShopPageBase<ClansManager, BankShop>
String playerGoldString = ChatColor.RESET + F.value("Your Gold", playerGold + "g"); String playerGoldString = ChatColor.RESET + F.value("Your Gold", playerGold + "g");
String purchaseString = ChatColor.RESET + F.value("Token Value", TOKEN_VALUE + "g"); String purchaseString = ChatColor.RESET + F.value("Token Value", TOKEN_VALUE + "g");
String goldString = ChatColor.RESET + C.cWhite + "Store your bank gold in the form of a gold token!"; String goldString = ChatColor.RESET + C.cWhite + "Store your bank gold in the form of a gold token!";
ShopItem shopItem = new ShopItem(Material.GOLD_INGOT, title, new String[] {" ", playerGoldString, purchaseString, goldString}, 0, true, true); ShopItem shopItem = new ShopItem(Material.GOLD_RECORD, title, new String[] {" ", playerGoldString, purchaseString, goldString}, 0, true, true);
addButton(3, shopItem, button); addButton(3, shopItem, button);
} }
@ -117,7 +117,7 @@ public class BankPage extends ShopPageBase<ClansManager, BankShop>
String playerGoldString = ChatColor.RESET + F.value("Your Gold", playerGold + "g"); String playerGoldString = ChatColor.RESET + F.value("Your Gold", playerGold + "g");
String purchaseString = ChatColor.RESET + C.cWhite + "You don't have enough gold"; String purchaseString = ChatColor.RESET + C.cWhite + "You don't have enough gold";
String goldString = ChatColor.RESET + C.cWhite + "You need " + C.cYellow + goldCost + C.cWhite + " gold to purchase a token."; String goldString = ChatColor.RESET + C.cWhite + "You need " + C.cYellow + goldCost + C.cWhite + " gold to purchase a token.";
ShopItem shopItem = new ShopItem(Material.GOLD_INGOT, title, new String[] {" ", playerGoldString, purchaseString, goldString}, 0, true, true); ShopItem shopItem = new ShopItem(Material.GOLD_RECORD, title, new String[] {" ", playerGoldString, purchaseString, goldString}, 0, true, true);
addButton(3, shopItem, button); addButton(3, shopItem, button);
} }