caskd
/
kami-blue
forked from RepoMirrors/kami-blue
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

close #621, close #618, close #615, close #614

This commit is contained in:
Bella 2020-03-28 10:54:57 -04:00
parent dffff519f5
commit c963ee11f8
No known key found for this signature in database
GPG Key ID: 815562EA23BFE344
5 changed files with 212 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/me/zeroeightsix/kami/command/commands/DiscordForwardCommand.java → src/main/java/me/zeroeightsix/kami/command/commands/DiscordNotifsCommand.java
View File

@ -4,20 +4,20 @@ import me.zeroeightsix.kami.KamiMod;
import me.zeroeightsix.kami.command.Command;
import me.zeroeightsix.kami.command.syntax.ChunkBuilder;
import me.zeroeightsix.kami.module.ModuleManager;
import me.zeroeightsix.kami.module.modules.chat.DiscordForward;
import me.zeroeightsix.kami.module.modules.chat.DiscordNotifs;
/**
* @author S-B99
* Created by S-B99 on 26/03/20
*/
public class DiscordForwardCommand extends Command {
public DiscordForwardCommand() {
super("discordforward", new ChunkBuilder().append("webhook url").append("avatar url").build(), "webhook");
public class DiscordNotifsCommand extends Command {
public DiscordNotifsCommand() {
super("discordnotifs", new ChunkBuilder().append("webhook url").append("discord id").append("avatar url").build(), "webhook");
}
@Override
public void call(String[] args) {
DiscordForward df = (DiscordForward) ModuleManager.getModuleByName("DiscordForward");
DiscordNotifs df = (DiscordNotifs) ModuleManager.getModuleByName("DiscordNotifs");
if (args[0] != null && !args[0].equals("")) {
df.url.setValue(args[0]);
Command.sendChatMessage(df.getChatName() + "Set URL to \"" + args[0] + "\"!");
@ -27,8 +27,14 @@ public class DiscordForwardCommand extends Command {
if (args[1] == null) return;
if (!args[1].equals("")) {
df.avatar.setValue(args[1]);
Command.sendChatMessage(df.getChatName() + "Set Avatar to \"" + args[1] + "\"!");
df.pingID.setValue(args[1]);
Command.sendChatMessage(df.getChatName() + "Set Discord ID to \"" + df.pingID.getValue() + "\"!");
}
if (args[2] == null) return;
if (!args[2].equals("")) {
df.avatar.setValue(args[2]);
Command.sendChatMessage(df.getChatName() + "Set Avatar to \"" + args[2] + "\"!");
} else {
df.avatar.setValue(KamiMod.GITHUB_LINK + "raw/assets/assets/icons/kami.png");
Command.sendChatMessage(df.getChatName() + "Reset Avatar!");

9
src/main/java/me/zeroeightsix/kami/event/events/ServerConnectedEvent.java Normal file
View File

@ -0,0 +1,9 @@
package me.zeroeightsix.kami.event.events;
import me.zeroeightsix.kami.event.KamiEvent;
public class ServerConnectedEvent extends KamiEvent {
public ServerConnectedEvent() {
super();
}
}

9
src/main/java/me/zeroeightsix/kami/event/events/ServerDisconnectedEvent.java Normal file
View File

@ -0,0 +1,9 @@
package me.zeroeightsix.kami.event.events;
import me.zeroeightsix.kami.event.KamiEvent;
public class ServerDisconnectedEvent extends KamiEvent {
public ServerDisconnectedEvent() {
super();
}
}

83
src/main/java/me/zeroeightsix/kami/module/modules/chat/DiscordForward.java
View File

@ -1,83 +0,0 @@
package me.zeroeightsix.kami.module.modules.chat;
import com.mrpowergamerbr.temmiewebhook.DiscordMessage;
import com.mrpowergamerbr.temmiewebhook.TemmieWebhook;
import me.zero.alpine.listener.EventHandler;
import me.zero.alpine.listener.Listener;
import me.zeroeightsix.kami.KamiMod;
import me.zeroeightsix.kami.command.Command;
import me.zeroeightsix.kami.event.events.PacketEvent;
import me.zeroeightsix.kami.module.Module;
import me.zeroeightsix.kami.module.ModuleManager;
import me.zeroeightsix.kami.module.modules.gui.InfoOverlay;
import me.zeroeightsix.kami.setting.Setting;
import me.zeroeightsix.kami.setting.Settings;
import me.zeroeightsix.kami.util.ColourTextFormatting;
import me.zeroeightsix.kami.util.TimeUtil;
import net.minecraft.network.play.server.SPacketChat;
import net.minecraft.util.text.TextFormatting;
import java.util.regex.Pattern;
import static me.zeroeightsix.kami.util.ColourTextFormatting.toTextMap;
/**
* @author S-B99
* Created by S-B99 on 26/03/20
*/
@Module.Info(name = "DiscordForward", category = Module.Category.CHAT, description = "Sends your chat to a set Discord channel")
public class DiscordForward extends Module {
private Setting<Boolean> time = register(Settings.b("Timestamp", true));
private Setting<Boolean> all = register(Settings.b("All Messages", false));
private Setting<Boolean> queue = register(Settings.booleanBuilder("Queue Position").withValue(true).withVisibility(v -> !all.getValue()).build());
private Setting<Boolean> direct = register(Settings.booleanBuilder("Direct Messages").withValue(true).withVisibility(v -> !all.getValue()).build());
public Setting<String> url = register(Settings.s("URL", "unchanged"));
public Setting<String> avatar = register(Settings.s("Avatar", KamiMod.GITHUB_LINK + "raw/assets/assets/icons/kami.png"));
@EventHandler
public Listener<PacketEvent.Receive> listener = new Listener<>(event -> {
if (mc.player == null || isDisabled()) return;
if (!(event.getPacket() instanceof SPacketChat)) return;
SPacketChat sPacketChat = (SPacketChat) event.getPacket();
if (shouldSend(sPacketChat.getChatComponent().getUnformattedText())) {
sendMessage(KamiMod.MODNAME, getTime() + sPacketChat.chatComponent.getUnformattedText(), avatar.getValue());
}
});
public void onEnable() {
if (url.getValue().equalsIgnoreCase("unchanged")) {
Command.sendErrorMessage(getChatName() + "You must first set a webhook url with the '&7" + Command.getCommandPrefix() + "discordforward&r' command");
disable();
}
}
private boolean shouldSend(String message) {
if (all.getValue()) return true;
else if (isQueue(message)) return true;
else return isDirect(message);
}
private boolean isDirect(String message) {
if (direct.getValue() && message.contains("whispers:")) return true;
else return direct.getValue() && Pattern.compile("to.*:", Pattern.CASE_INSENSITIVE).matcher(message).find();
}
private boolean isQueue(String message) {
if (queue.getValue() && message.contains("Position in queue:")) {
return true;
} else return queue.getValue() && message.contains("2b2t is full");
}
private String getTime() {
if (!time.getValue() || ModuleManager.getModuleByName("ChatTimestamp").isEnabled()) return "";
InfoOverlay info = (InfoOverlay) ModuleManager.getModuleByName("InfoOverlay");
return "[" + TimeUtil.getFinalTime(info.timeUnitSetting.getValue(), info.timeTypeSetting.getValue(), info.doLocale.getValue()) + "] ";
}
private void sendMessage(String username, String content, String avatarUrl) {
TemmieWebhook tm = new TemmieWebhook(url.getValue());
DiscordMessage dm = new DiscordMessage(username, content, avatarUrl);
tm.sendMessage(dm);
}
}

181
src/main/java/me/zeroeightsix/kami/module/modules/chat/DiscordNotifs.java Normal file
View File

@ -0,0 +1,181 @@
package me.zeroeightsix.kami.module.modules.chat;
import com.mrpowergamerbr.temmiewebhook.DiscordMessage;
import com.mrpowergamerbr.temmiewebhook.TemmieWebhook;
import me.zero.alpine.listener.EventHandler;
import me.zero.alpine.listener.Listener;
import me.zeroeightsix.kami.KamiMod;
import me.zeroeightsix.kami.command.Command;
import me.zeroeightsix.kami.event.events.GuiScreenEvent;
import me.zeroeightsix.kami.event.events.PacketEvent;
import me.zeroeightsix.kami.event.events.ServerConnectedEvent;
import me.zeroeightsix.kami.event.events.ServerDisconnectedEvent;
import me.zeroeightsix.kami.module.Module;
import me.zeroeightsix.kami.module.ModuleManager;
import me.zeroeightsix.kami.module.modules.gui.InfoOverlay;
import me.zeroeightsix.kami.setting.Setting;
import me.zeroeightsix.kami.setting.Settings;
import me.zeroeightsix.kami.util.TimeUtil;
import net.minecraft.client.gui.GuiDisconnected;
import net.minecraft.client.multiplayer.GuiConnecting;
import net.minecraft.client.multiplayer.ServerData;
import net.minecraft.network.play.server.SPacketChat;
import java.util.regex.Pattern;
import static me.zeroeightsix.kami.KamiMod.EVENT_BUS;
/**
* @author S-B99
* Created by S-B99 on 26/03/20
* Updated by S-B99 on 28/03/20
*/
@Module.Info(name = "DiscordNotifs", category = Module.Category.CHAT, description = "Sends your chat to a set Discord channel", alwaysListening = true)
public class DiscordNotifs extends Module {
private Setting<Boolean> timeout = register(Settings.b("Timeout", true));
private Setting<Integer> timeoutTime = register(Settings.integerBuilder().withName("Seconds").withMinimum(0).withMaximum(120).withValue(10).withVisibility(v -> timeout.getValue()).build());
private Setting<Boolean> time = register(Settings.b("Timestamp", true));
private Setting<Boolean> importantPings = register(Settings.b("Important Pings", false));
private Setting<Boolean> disconnect = register(Settings.b("Disconnect Msgs", true));
private Setting<Boolean> all = register(Settings.b("All Messages", false));
private Setting<Boolean> queue = register(Settings.booleanBuilder("Queue Position").withValue(true).withVisibility(v -> !all.getValue()).build());
private Setting<Boolean> restart = register(Settings.booleanBuilder("Restart Msgs").withValue(true).withVisibility(v -> !all.getValue()).build());
private Setting<Boolean> direct = register(Settings.booleanBuilder("Direct Msgs").withValue(true).withVisibility(v -> !all.getValue()).build());
public Setting<String> url = register(Settings.s("URL", "unchanged"));
public Setting<String> pingID = register(Settings.s("Ping ID", "unchanged"));
public Setting<String> avatar = register(Settings.s("Avatar", KamiMod.GITHUB_LINK + "raw/assets/assets/icons/kami.png"));
private static ServerData cServer;
/* Listeners to send the messages */
@EventHandler
public Listener<PacketEvent.Receive> listener0 = new Listener<>(event -> {
if (mc.player == null || isDisabled()) return;
if (!(event.getPacket() instanceof SPacketChat)) return;
SPacketChat sPacketChat = (SPacketChat) event.getPacket();
String message = sPacketChat.getChatComponent().getUnformattedText();
if (timeout(message) && shouldSend(message)) {
sendMessage(getPingID(message) + getMessageType(message) + getTime() + message, avatar.getValue());
}
});
@EventHandler
public Listener<ServerConnectedEvent> listener1 = new Listener<>(event -> {
if (isDisabled()) return;
if (!disconnect.getValue()) return;
sendMessage(getPingID("KamiBlueMessageType1") + getTime() + getMessageType("KamiBlueMessageType1"), avatar.getValue());
});
@EventHandler
public Listener<ServerDisconnectedEvent> listener2 = new Listener<>(event -> {
if (isDisabled()) return;
if (!disconnect.getValue()) return;
sendMessage(getPingID("KamiBlueMessageType2") + getTime() + getMessageType("KamiBlueMessageType2"), avatar.getValue());
});
/* Getters for messages */
private static long startTime = 0;
private boolean timeout(String message) {
if (!timeout.getValue()) return true;
else if (isRestart(message)) return true;
else if (isDirect(message) || isDirectOther(message)) return true;
if (startTime == 0) startTime = System.currentTimeMillis();
if (startTime + (timeoutTime.getValue() * 1000) <= System.currentTimeMillis()) { // 1 timeout = 1 second = 1000 ms
startTime = System.currentTimeMillis();
return true;
}
return false;
}
private boolean shouldSend(String message) {
if (all.getValue()) return true;
else if (isRestart(message)) return true;
else if (isDirect(message) || isDirectOther(message)) return true;
else if (isQueue(message)) return true;
else return false;
}
private boolean isDirect(String message) {
return direct.getValue() && message.contains("whispers:");
}
private boolean isDirectOther(String message) {
return direct.getValue() && Pattern.compile("to.*:", Pattern.CASE_INSENSITIVE).matcher(message).find();
}
private boolean isQueue(String message) {
if (queue.getValue() && message.contains("Position in queue:")) return true;
else return queue.getValue() && message.contains("2b2t is full");
}
private boolean isRestart(String message) {
return restart.getValue() && message.contains("[SERVER] Server restarting in");
}
/* Text formatting and misc methods */
private String getPingID(String message) {
if (isRestart(message)) return formatPingID();
else if (isDirect(message)) return formatPingID();
else if (isDirectOther(message)) return formatPingID();
else if ((message.equals("KamiBlueMessageType1")) || (message.equals("KamiBlueMessageType2"))) return formatPingID();
else return "";
}
private String getMessageType(String message) {
if (isDirect(message)) return ": you got a direct message!\n";
if (isDirectOther(message)) return ": you sent a direct message!\n";
if (message.equals("KamiBlueMessageType1")) return "Connected to " + getServer();
if (message.equals("KamiBlueMessageType2")) return "Disconnected from " + getServer();
return "";
}
private String formatPingID() {
if (!importantPings.getValue()) return "";
else return "<@!" + pingID.getValue() + "> ";
}
private String getServer() {
if (cServer == null) return "the server";
else return cServer.serverIP;
}
private String getTime() {
if (!time.getValue() || ModuleManager.getModuleByName("ChatTimestamp").isEnabled()) return "";
InfoOverlay info = (InfoOverlay) ModuleManager.getModuleByName("InfoOverlay");
return "[" + TimeUtil.getFinalTime(info.timeUnitSetting.getValue(), info.timeTypeSetting.getValue(), info.doLocale.getValue()) + "] ";
}
private void sendMessage(String content, String avatarUrl) {
TemmieWebhook tm = new TemmieWebhook(url.getValue());
DiscordMessage dm = new DiscordMessage(KamiMod.MODNAME + " " + KamiMod.MODVER, content, avatarUrl);
tm.sendMessage(dm);
}
/* Always on status code */
public void onUpdate() {
if (isDisabled()) return;
if (url.getValue().equals("unchanged")) {
Command.sendErrorMessage(getChatName() + "You must first set a webhook url with the '&7" + Command.getCommandPrefix() + "discordnotifs&r' command");
disable();
}
else if (pingID.getValue().equals("unchanged") && importantPings.getValue()) {
Command.sendErrorMessage(getChatName() + "For Pings to work, you must set a Discord ID with the '&7" + Command.getCommandPrefix() + "discordnotifs&r' command");
disable();
}
}
@EventHandler
public Listener<GuiScreenEvent.Closed> serverConnectedEvent = new Listener<>(event -> {
if (isEnabled() && event.getScreen() instanceof GuiConnecting) {
cServer = mc.currentServerData;
EVENT_BUS.post(new ServerConnectedEvent());
}
});
@EventHandler
public Listener<GuiScreenEvent.Displayed> serverDisconnectedEvent = new Listener<>(event -> {
if (isEnabled() && event.getScreen() instanceof GuiDisconnected && (cServer != null || mc.currentServerData != null)) {
EVENT_BUS.post(new ServerDisconnectedEvent());
}
});
}