Skip to content

Commit 8f0e682

Browse files
committed
Cleanup a bit
Signed-off-by: Emily Engel <Justsweetluna@gmail.com>
1 parent faa4ac0 commit 8f0e682

File tree

2 files changed

+26
-8
lines changed

2 files changed

+26
-8
lines changed

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
import net.labymod.utils.ModColor;
1717
import net.minecraft.client.network.NetworkPlayerInfo;
1818
import net.minecraft.entity.player.EntityPlayer;
19-
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
20-
import net.minecraftforge.fml.common.gameevent.TickEvent;
2119

2220
import java.util.*;
2321
import java.util.logging.Logger;
@@ -65,7 +63,7 @@ public void onEnable() {
6563
System.out.println(PREFIX + "Starting...");
6664
}
6765

68-
@SubscribeEvent
66+
/* @SubscribeEvent
6967
public void onTick(TickEvent.ClientTickEvent event) {
7068
if (!voiceexist) {
7169
for (LabyModAddon addon : AddonLoader.getAddons()) {
@@ -83,7 +81,7 @@ public void onTick(TickEvent.ClientTickEvent event) {
8381
}
8482
}
8583
}
86-
}
84+
} */
8785

8886
private UserActionEntry createBlacklistEntry() {
8987
return new UserActionEntry(
@@ -282,15 +280,19 @@ public boolean isConfigMessage() {
282280
return this.configMessage;
283281
}
284282

285-
public boolean isVoiceexist() {
286-
return voiceexist;
287-
}
288-
289283
public boolean isMuted() {
290284
return muted;
291285
}
292286

293287
public void setMuted(boolean muted) {
294288
this.muted = muted;
295289
}
290+
291+
public boolean isVoiceexist() {
292+
return voiceexist;
293+
}
294+
295+
public void setVoiceexist(boolean voiceexist) {
296+
this.voiceexist = voiceexist;
297+
}
296298
}

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
import meow.emily.patootie.util.Utils;
66
import net.labymod.addon.AddonLoader;
77
import net.labymod.addons.voicechat.VoiceChat;
8+
import net.labymod.api.LabyModAddon;
89
import net.labymod.main.LabyMod;
910
import net.minecraft.client.Minecraft;
1011
import net.minecraft.entity.player.EntityPlayer;
1112
import net.minecraftforge.client.event.RenderPlayerEvent;
1213
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
1314
import net.minecraftforge.fml.common.gameevent.InputEvent;
15+
import net.minecraftforge.fml.common.gameevent.TickEvent;
1416
import org.lwjgl.input.Keyboard;
1517

1618
import java.util.List;
@@ -24,6 +26,20 @@ public class PlayerEventHandler {
2426
// UUID VoiceChat 1.8
2527
private final UUID VcUuid8 = UUID.fromString("43152d5b-ca80-4b29-8f48-39fd63e48dee");
2628

29+
@SubscribeEvent
30+
public void onTick(TickEvent.ClientTickEvent event) {
31+
Emily instance = Emily.getInstance();
32+
if (!instance.isVoiceexist()) {
33+
LabyModAddon addon = AddonLoader.getAddonByUUID(UUID.fromString(String.valueOf(vcUuid12)));
34+
if (addon instanceof VoiceChat && addon.about.name.equals("VoiceChat")) {
35+
VoiceChat voiceChat = (VoiceChat) addon;
36+
instance.setVoiceexist(true);
37+
} else {
38+
instance.setVoiceexist(false);
39+
}
40+
}
41+
}
42+
2743
@SubscribeEvent
2844
public void onPrePlayerRender(RenderPlayerEvent.Pre e) {
2945
Emily instance = Emily.getInstance();

0 commit comments

Comments
 (0)