diff --git a/Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java b/Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java index 28744fa09..67f811440 100644 --- a/Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java +++ b/Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java @@ -61,11 +61,16 @@ public class PacketPlayOutPlayerInfo extends Packet { } public static PacketPlayOutPlayerInfo updateDisplayName(EntityPlayer player) { + return updateDisplayName(player, getFormattedName(player)); + } + + public static PacketPlayOutPlayerInfo updateDisplayName(EntityPlayer player, String displayName) + { PacketPlayOutPlayerInfo packet = new PacketPlayOutPlayerInfo(); packet.action = 3; packet.username = player.listName; packet.player = player.getProfile(); - packet._tabName = getFormattedName(player); + packet._tabName = displayName; return packet; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureStyle.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureStyle.java index f2ce6e985..f6f91a858 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureStyle.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureStyle.java @@ -1,33 +1,24 @@ package mineplex.core.treasure; -import org.bukkit.Material; import org.bukkit.Sound; import mineplex.core.common.util.UtilParticle.ParticleType; -/** - * Created by Shaun on 8/28/2014. - */ public enum TreasureStyle { - /** - * These are examples, not final! - */ - - - BASIC( + OLD( ParticleType.EXPLODE, ParticleType.EXPLODE, Sound.FIZZ, Sound.HORSE_ARMOR), - HEROIC( + ANCIENT( ParticleType.FLAME, ParticleType.LAVA, Sound.LAVA_POP, Sound.EXPLODE), - LEGENDARY( + MYTHICAL( ParticleType.HAPPY_VILLAGER, ParticleType.LARGE_EXPLODE, Sound.PORTAL_TRAVEL, diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureType.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureType.java index 5680cca86..861f47a91 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureType.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureType.java @@ -7,11 +7,11 @@ import mineplex.core.reward.RewardType; public enum TreasureType { - OLD(C.cYellow + "Old Chest", "Old Chest", RewardType.OldChest, Material.CHEST, TreasureStyle.BASIC), + OLD(C.cYellow + "Old Chest", "Old Chest", RewardType.OldChest, Material.CHEST, TreasureStyle.OLD), - ANCIENT(C.cGold + "Ancient Chest", "Ancient Chest", RewardType.AncientChest, Material.TRAPPED_CHEST, TreasureStyle.HEROIC), + ANCIENT(C.cGold + "Ancient Chest", "Ancient Chest", RewardType.AncientChest, Material.TRAPPED_CHEST, TreasureStyle.ANCIENT), - MYTHICAL(C.cRed + "Mythical Chest", "Mythical Chest", RewardType.MythicalChest, Material.ENDER_CHEST, TreasureStyle.LEGENDARY); + MYTHICAL(C.cRed + "Mythical Chest", "Mythical Chest", RewardType.MythicalChest, Material.ENDER_CHEST, TreasureStyle.MYTHICAL); private final String _name; private final RewardType _rewardType;