Skip to content

Commit 4af6cd0

Browse files
committed
cleanup
Signed-off-by: Emily Engel <Justsweetluna@gmail.com>
1 parent fc803e1 commit 4af6cd0

File tree

2 files changed

+7
-50
lines changed

2 files changed

+7
-50
lines changed

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

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -61,30 +61,8 @@ public void onEnable() {
6161
(user, entityPlayer, networkPlayerInfo, list) ->
6262
list.add(createBlacklistRemoval())
6363
);
64-
65-
System.out.println("Starting...");
6664
}
6765

68-
/* @SubscribeEvent
69-
public void onTick(TickEvent.ClientTickEvent event) {
70-
if (!voiceexist) {
71-
for (LabyModAddon addon : AddonLoader.getAddons()) {
72-
if (addon == null || addon.about == null || addon.about.name == null) {
73-
continue;
74-
}
75-
LabyModAddon voicechat = AddonLoader.getAddonByUUID(UUID.fromString(String.valueOf()));
76-
if (voicechat instanceof VoiceChat && addon.about.name.equals("VoiceChat")) {
77-
voiceChat = (VoiceChat) addon;
78-
System.out.println(PREFIX + "VoiceChat found!");
79-
voiceexist = true;
80-
} else {
81-
System.out.println(PREFIX + "VoiceChat not found!");
82-
voiceexist = false;
83-
}
84-
}
85-
}
86-
} */
87-
8866
private UserActionEntry createBlacklistEntry() {
8967
return new UserActionEntry(
9068
"Blacklist Player",
@@ -97,12 +75,6 @@ public void execute(User user, EntityPlayer entityPlayer, NetworkPlayerInfo netw
9775
UUID uuid = networkPlayerInfo.getGameProfile().getId();
9876
LabyMod.getInstance().displayMessageInChat(networkPlayerInfo.getGameProfile().getId().toString());
9977
VoiceChat voiceChat = (VoiceChat) AddonLoader.getAddonByUUID(vcUuid8);
100-
if (isVoiceexist()) {
101-
Map<UUID, Integer> volume = voiceChat.getPlayerVolumes();
102-
voiceChat.getPlayerVolumes().put(uuid, 0);
103-
volume.put(uuid, 0);
104-
voiceChat.savePlayersVolumes();
105-
}
10678
playersToRender.put(networkPlayerInfo.getGameProfile().getId(), 0);
10779
savePlayersToRender();
10880
playersToRenderString.add(networkPlayerInfo.getGameProfile().getName());
@@ -200,7 +172,7 @@ protected void fillSettings(List<SettingsElement> subSettings) {
200172
subSettings.add(new BooleanElement(
201173
"Enable PlayerHider",
202174
this, new ControlElement.IconData(Material.REDSTONE),
203-
"enabled", isModOn())
175+
"enabled", modOn)
204176
);
205177
subSettings.add(new BooleanElement(
206178
"Enable Messages",
@@ -217,24 +189,12 @@ protected void fillSettings(List<SettingsElement> subSettings) {
217189
new ControlElement.IconData(Material.REDSTONE_TORCH_ON), this.key, integer -> {
218190
this.key = integer;
219191
getConfig().addProperty("key", integer);
220-
saveConfig();
221192
});
222-
223-
// If you know how to make both, THIS and the STRING Value to update simultaniously
224-
// feel free to edit this in, so we can use This
225-
/*
226-
StringElement Blacklistbutton = new StringElement(
227-
"Blacklist", new ControlElement.IconData(Material.COAL_BLOCK),
228-
String.join(",", playersToRenderString), this::AddPlayer);
229-
subSettings.add(new HeaderElement(ModColor.cl('a') + "Seperate them by Comma"));
230-
231-
*/
232193
subSettings.add(keyElement);
233194
}
234195

235196
public void RemovePlayer(String s) {
236197
// remove from the list
237-
238198
playersToRenderString.remove(s);
239199
savePlayersToRenderString();
240200
// playersToRenderString.removeIf(player -> player.equals(s));
@@ -248,7 +208,6 @@ public void savePlayersToRender() {
248208
Integer volume = uuidIntegerEntry.getValue();
249209
object.addProperty(uuid, volume);
250210
}
251-
//labyMod().displayMessageInChat(playersToRender.toString());
252211
getConfig().add("playersToRender", object);
253212
saveConfig();
254213
}

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,12 @@ public void onKeyInput(InputEvent.KeyInputEvent e) {
116116
instance.setRenderPlayers(true);
117117
instance.setMuted(true);
118118
instance.saveConfig();
119-
if (instance.isVoiceexist()) {
120-
if (enPlayer != null) {
121-
Minecraft.getMinecraft().world.playerEntities.stream()
122-
.filter(entityPlayer ->
123-
Emily.getInstance().getPlayersToRenderString()
124-
.contains(entityPlayer.getName())).
125-
forEach(this::mute);
126-
}
119+
if (instance.isVoiceexist() && instance.isPlayerUnmute()) {
120+
Minecraft.getMinecraft().world.playerEntities.stream()
121+
.filter(entityPlayer ->
122+
Emily.getInstance().getPlayersToRenderString()
123+
.contains(entityPlayer.getName())).
124+
forEach(this::mute);
127125
}
128126
if (instance.isConfigMessage()) {
129127
labymod.displayMessageInChat(ChatFormatting.GRAY + ">>" + "[" + ChatFormatting.AQUA + "PH" + ChatFormatting.WHITE + "]" + ChatFormatting.BOLD + ChatFormatting.DARK_RED + " off");

0 commit comments

Comments
 (0)