Clean up some code and UI
This commit is contained in:
parent
68e7361c00
commit
188d927727
|
@ -845,7 +845,6 @@ public class UtilText
|
|||
RN_I[number % 10];
|
||||
}
|
||||
|
||||
|
||||
public static String replaceLeet(String in)
|
||||
{
|
||||
if (in.trim().isEmpty())
|
||||
|
@ -859,7 +858,7 @@ public class UtilText
|
|||
}
|
||||
|
||||
return in;
|
||||
}
|
||||
}
|
||||
|
||||
public static String capitalise(String input)
|
||||
{
|
||||
|
|
|
@ -20,19 +20,20 @@ public class DiscordButton implements GuiItem
|
|||
.setData((short) 9)
|
||||
.setTitle(C.cGreen + C.Bold + "Visit our Discord Server")
|
||||
.addLore(
|
||||
C.cWhite + "Check our our official Discord server where",
|
||||
C.cWhite + "you will find news, changelogs, giveaways,",
|
||||
C.cWhite + "direct feedback to our admins, and more!",
|
||||
C.cWhite + "Check out our official Discord server where",
|
||||
C.cWhite + "you can find news, changelogs and giveaways,",
|
||||
C.cWhite + "give direct feedback to our admins, and more!",
|
||||
" ",
|
||||
C.cGreen + "Click to visit our discord!"
|
||||
C.cGreen + "Click to visit our Discord!"
|
||||
)
|
||||
.build();
|
||||
|
||||
private static final String URL = "http://discord.mineplex.com";
|
||||
private final Player _player;
|
||||
|
||||
public DiscordButton(Player player)
|
||||
{
|
||||
this._player = player;
|
||||
_player = player;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -61,4 +62,4 @@ public class DiscordButton implements GuiItem
|
|||
{
|
||||
return ICON;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -41,7 +41,6 @@ import mineplex.core.account.CoreClient;
|
|||
import mineplex.core.account.CoreClientManager;
|
||||
import mineplex.core.account.permissions.Permission;
|
||||
import mineplex.core.account.permissions.PermissionGroup;
|
||||
import mineplex.core.achievement.AchievementManager;
|
||||
import mineplex.core.chat.command.BroadcastCommand;
|
||||
import mineplex.core.chat.command.ChatSlowCommand;
|
||||
import mineplex.core.chat.command.HelpCommand;
|
||||
|
@ -93,7 +92,6 @@ public class Chat extends MiniPlugin
|
|||
private final IncognitoManager _incognitoManager;
|
||||
private final CoreClientManager _clientManager;
|
||||
private final PreferencesManager _preferencesManager;
|
||||
private final AchievementManager _achievementManager;
|
||||
|
||||
private int _chatSlowCooldown = 0;
|
||||
private long _silenceLength;
|
||||
|
@ -104,7 +102,6 @@ public class Chat extends MiniPlugin
|
|||
private List<Function<AsyncPlayerChatEvent, Boolean>> _lowPriorityFilters = new ArrayList<>();
|
||||
|
||||
private Map<UUID, MessageData> _playerLastMessage = new HashMap<>();
|
||||
private Map<UUID, Function<String, String>> _transformNextMessage = new HashMap<>();
|
||||
|
||||
public Chat()
|
||||
{
|
||||
|
@ -113,7 +110,6 @@ public class Chat extends MiniPlugin
|
|||
_incognitoManager = require(IncognitoManager.class);
|
||||
_clientManager = require(CoreClientManager.class);
|
||||
_preferencesManager = require(PreferencesManager.class);
|
||||
_achievementManager = require(AchievementManager.class);
|
||||
|
||||
new SpamHandler();
|
||||
|
||||
|
@ -191,7 +187,8 @@ public class Chat extends MiniPlugin
|
|||
}
|
||||
}
|
||||
|
||||
public long getChatSilence() {
|
||||
public long getChatSilence()
|
||||
{
|
||||
return _silenceLength;
|
||||
}
|
||||
|
||||
|
@ -452,19 +449,20 @@ public class Chat extends MiniPlugin
|
|||
|
||||
public static void trustCert() throws Exception
|
||||
{
|
||||
TrustManager[] trustAllCerts = new TrustManager[] {
|
||||
new X509TrustManager()
|
||||
TrustManager[] trustAllCerts = new TrustManager[]
|
||||
{
|
||||
new X509TrustManager()
|
||||
{
|
||||
public java.security.cert.X509Certificate[] getAcceptedIssuers()
|
||||
{
|
||||
public java.security.cert.X509Certificate[] getAcceptedIssuers()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
public void checkClientTrusted(X509Certificate[] certs, String authType) { }
|
||||
|
||||
public void checkServerTrusted(X509Certificate[] certs, String authType) { }
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public void checkClientTrusted(X509Certificate[] certs, String authType) { }
|
||||
|
||||
public void checkServerTrusted(X509Certificate[] certs, String authType) { }
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
SSLContext sc = SSLContext.getInstance("SSL");
|
||||
|
|
|
@ -82,7 +82,8 @@ public class ChatExtraCommand extends CommandBase<Chat>
|
|||
return;
|
||||
}
|
||||
|
||||
UtilServer.runAsync(() -> {
|
||||
UtilServer.runAsync(() ->
|
||||
{
|
||||
String chatMessage = "";
|
||||
|
||||
if (args.length > 0)
|
||||
|
|
|
@ -5,15 +5,10 @@ import java.util.HashMap;
|
|||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraft.server.v1_8_R3.EntityCreature;
|
||||
import net.minecraft.server.v1_8_R3.NavigationAbstract;
|
||||
import net.minecraft.server.v1_8_R3.PacketPlayInUseEntity;
|
||||
import net.minecraft.server.v1_8_R3.PacketPlayOutEntityDestroy;
|
||||
import net.minecraft.server.v1_8_R3.PacketPlayOutSpawnEntityLiving;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Color;
|
||||
|
@ -91,7 +86,6 @@ import mineplex.core.updater.event.UpdateEvent;
|
|||
import mineplex.core.visibility.VisibilityManager;
|
||||
import mineplex.minecraft.game.core.combat.DeathMessageType;
|
||||
import mineplex.minecraft.game.core.damage.CustomDamageEvent;
|
||||
|
||||
import nautilus.game.arcade.ArcadeManager;
|
||||
import nautilus.game.arcade.GameType;
|
||||
import nautilus.game.arcade.events.GamePrepareCountdownCommence;
|
||||
|
@ -118,6 +112,11 @@ import nautilus.game.arcade.stats.BadHiderStatTracker;
|
|||
import nautilus.game.arcade.stats.HunterKillerStatTracker;
|
||||
import nautilus.game.arcade.stats.HunterOfTheYearStatTracker;
|
||||
import nautilus.game.arcade.stats.MeowStatTracker;
|
||||
import net.minecraft.server.v1_8_R3.EntityCreature;
|
||||
import net.minecraft.server.v1_8_R3.NavigationAbstract;
|
||||
import net.minecraft.server.v1_8_R3.PacketPlayInUseEntity;
|
||||
import net.minecraft.server.v1_8_R3.PacketPlayOutEntityDestroy;
|
||||
import net.minecraft.server.v1_8_R3.PacketPlayOutSpawnEntityLiving;
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
public class HideSeek extends TeamGame
|
||||
|
@ -207,16 +206,16 @@ public class HideSeek extends TeamGame
|
|||
|
||||
private boolean _started = false;
|
||||
|
||||
private final HashMap<Player, Integer> _arrowHits = new HashMap<>();
|
||||
private final Map<Player, Integer> _arrowHits = new HashMap<>();
|
||||
|
||||
private final HashMap<Player, Form> _forms = new HashMap<>();
|
||||
private final HashMap<Player, InfestedData> _infested = new HashMap<>();
|
||||
private final HashSet<LivingEntity> _infestDeny = new HashSet<>();
|
||||
private final Map<Player, Form> _forms = new HashMap<>();
|
||||
private final Map<Player, InfestedData> _infested = new HashMap<>();
|
||||
private final Set<LivingEntity> _infestDeny = new HashSet<>();
|
||||
|
||||
private final HashMap<Creature, Location> _mobs = new HashMap<>();
|
||||
private final Map<Creature, Location> _mobs = new HashMap<>();
|
||||
|
||||
private ArrayList<Material> _allowedBlocks;
|
||||
private ArrayList<EntityType> _allowedEnts;
|
||||
private List<Material> _allowedBlocks;
|
||||
private List<EntityType> _allowedEnts;
|
||||
|
||||
private final Set<Player> _startingHunters = new HashSet<>();
|
||||
|
||||
|
@ -438,9 +437,7 @@ public class HideSeek extends TeamGame
|
|||
int id = Integer.parseInt(split[i]);
|
||||
_allowedBlocks.add(Material.getMaterial(id));
|
||||
}
|
||||
catch (NumberFormatException ex)
|
||||
{
|
||||
}
|
||||
catch (NumberFormatException ex) {}
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -1789,12 +1786,12 @@ public class HideSeek extends TeamGame
|
|||
super.disqualify(player);
|
||||
}
|
||||
|
||||
public HashMap<Player, Form> getForms()
|
||||
public Map<Player, Form> getForms()
|
||||
{
|
||||
return _forms;
|
||||
}
|
||||
|
||||
public ArrayList<Material> getAllowedBlocks()
|
||||
public List<Material> getAllowedBlocks()
|
||||
{
|
||||
return _allowedBlocks;
|
||||
}
|
||||
|
@ -1803,4 +1800,4 @@ public class HideSeek extends TeamGame
|
|||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue