kinda cleanup ngl

Author: HerXayah

src/main/java/meow/emily/patootie/Emily.java

@@ -73,7 +73,7 @@ private UserActionEntry createBlacklistEntry() {
                     public void execute(User user, EntityPlayer entityPlayer, NetworkPlayerInfo networkPlayerInfo) {
                         try {
                             UUID uuid = networkPlayerInfo.getGameProfile().getId();
-                            LabyMod.getInstance().displayMessageInChat(networkPlayerInfo.getGameProfile().getId().toString());
+                            //LabyMod.getInstance().displayMessageInChat(networkPlayerInfo.getGameProfile().getId().toString());
                             VoiceChat voiceChat = (VoiceChat) AddonLoader.getAddonByUUID(vcUuid8);
                             playersToRender.put(networkPlayerInfo.getGameProfile().getId(), 0);
                             savePlayersToRender();

src/main/java/meow/emily/patootie/events/CommandHandler.java

@@ -1,7 +1,6 @@
 package meow.emily.patootie.events;
 
 import meow.emily.patootie.Emily;
-import meow.emily.patootie.util.MessageHandler;
 import meow.emily.patootie.util.Utils;
 import net.labymod.addon.AddonLoader;
 import net.labymod.addons.voicechat.VoiceChat;
@@ -26,16 +25,16 @@ public class PlayerEventHandler {
     // UUID VoiceChat 1.8
     private final UUID vcUuid8 = UUID.fromString("43152d5b-ca80-4b29-8f48-39fd63e48dee");
 
-    // We do be handling those messages
-    MessageHandler out = MessageHandler.getInstance();
+    boolean keyPressed = false;
+    int keycount = 0;
 
     // im gonna kms ngl
+    Emily instance = Emily.getInstance();
+    LabyMod labymod = LabyMod.getInstance();
     Minecraft minecraft = Minecraft.getMinecraft();
 
-
     @SubscribeEvent
     public void onTick(TickEvent.ClientTickEvent event) {
-        Emily instance = Emily.getInstance();
         if (!instance.isVoiceexist()) {
             LabyModAddon addon = AddonLoader.getAddonByUUID(UUID.fromString(String.valueOf(vcUuid12)));
             if (addon instanceof VoiceChat && addon.about.name.equals("VoiceChat")) {
@@ -49,7 +48,6 @@ public void onTick(TickEvent.ClientTickEvent event) {
 
     @SubscribeEvent
     public void onPrePlayerRender(RenderPlayerEvent.Pre e) {
-        Emily instance = Emily.getInstance();
         EntityPlayer enPlayer = e.getEntityPlayer();
         if (instance.isRenderPlayers() && instance.isModOn()) {
             if (instance.isRenderPlayers() && !enPlayer.equals(minecraft.player)) {
@@ -67,7 +65,6 @@ public void onPrePlayerRender(RenderPlayerEvent.Pre e) {
     }
 
     public void mute(EntityPlayer player) {
-        Emily instance = Emily.getInstance();
         VoiceChat voiceChat = (VoiceChat) AddonLoader.getAddonByUUID(this.vcUuid12);
         if (!player.equals(minecraft.player)) {
             voiceChat.getPlayerVolumes().put(player.getUniqueID(), 0);
@@ -77,15 +74,13 @@ public void mute(EntityPlayer player) {
 
     public void RemovePlayer(String s) {
         // remove from the list
-        Emily instance = Emily.getInstance();
         instance.getPlayersToRenderString().remove(s);
         instance.savePlayersToRenderString();
         //  playersToRenderString.removeIf(player -> player.equals(s));
         instance.saveConfig();
     }
 
     public void unmute(EntityPlayer player) {
-        Emily instance = Emily.getInstance();
         VoiceChat voiceChat = (VoiceChat) AddonLoader.getAddonByUUID(this.vcUuid12);
         UUID uuid = player.getUniqueID();
         Map<UUID, Integer> volume = voiceChat.getPlayerVolumes();
@@ -95,28 +90,39 @@ public void unmute(EntityPlayer player) {
         voiceChat.savePlayersVolumes();
     }
 
+    public void sendMessage(String message) {
+        try {
+            labymod.displayMessageInChat(message);
+        } catch (Exception e) {
+            e.printStackTrace();
+            labymod.displayMessageInChat(e.getMessage());
+        }
+
+    }
+
     @SubscribeEvent
     public void onKeyInput(InputEvent.KeyInputEvent e) {
         EntityPlayer enPlayer = minecraft.player;
-        Emily instance = Emily.getInstance();
-        LabyMod labymod = LabyMod.getInstance();
         if (instance.getKey() > -1) {
             if (Keyboard.isKeyDown(instance.getKey())) {
-                if (instance.isModOn()) {
+                while (keyPressed || Keyboard.isRepeatEvent()) {
+                    return;
+                }
+                if (instance.isModOn() && !keyPressed) {
+                    keyPressed = true;
                     if (instance.isRenderPlayers()) {
                         instance.setRenderPlayers(false);
                         instance.setMuted(false);
                         instance.saveConfig();
                         if (instance.isVoiceexist() && instance.isPlayerUnmute()) {
                             minecraft.world.playerEntities.stream()
                                     .filter(entityPlayer ->
-                                            Emily.getInstance().getPlayersToRenderString()
+                                            instance.getPlayersToRenderString()
                                                     .contains(entityPlayer.getName())).
                                     forEach(this::unmute);
-                            //removePlayer(enPlayer.getGameProfile().getName());
                         }
                         if (instance.isConfigMessage()) {
-                            out.sendMessage("[PH] - On");
+                            sendMessage("[PH] - On");
                         }
                     } else {
                         instance.setRenderPlayers(true);
@@ -125,17 +131,18 @@ public void onKeyInput(InputEvent.KeyInputEvent e) {
                         if (instance.isVoiceexist() && instance.isPlayerUnmute()) {
                             minecraft.world.playerEntities.stream()
                                     .filter(entityPlayer ->
-                                            Emily.getInstance().getPlayersToRenderString()
+                                            instance.getPlayersToRenderString()
                                                     .contains(entityPlayer.getName())).
                                     forEach(this::mute);
                         }
                         if (instance.isConfigMessage()) {
-                            out.sendMessage("[PH] - Off");
+                            sendMessage("[PH] - Off");
                         }
                     }
                 } else {
-                    out.sendMessage("[PH] - Mod seems to be disabled. Check Config.");
+                    sendMessage("[PH] - Mod seems to be disabled. Check Config.");
                 }
+                keyPressed = false;
             }
         }
     }