ChomeNS/chomens-bot-java
3
1
Fork 3
Code Issues Pull requests Projects Releases Packages Wiki Activity

IMPROVE config + FIX hashing in console which improves too ig

Browse source
This commit is contained in:
ChomeNS 2023-03-21 11:36:47 +07:00
parent b75c4c29ab
commit 03e20a5476
11 changed files with 61 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/me/chayapak1/chomensbot_mabe/Bot.java
View file

@ -12,7 +12,7 @@ import me.chayapak1.chomensbot_mabe.plugins.*;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@ -24,6 +24,7 @@ public class Bot {
@Getter private final int port;
@Getter private final String username;
@Getter private final List<Bot> allBots;
@Getter private final Map<String, String> keys;
@Getter private Session session;
@ -42,12 +43,13 @@ public class Bot {
@Getter private final HashingPlugin hashing = new HashingPlugin(this);
@Getter private final MusicPlayerPlugin music = new MusicPlayerPlugin(this);
public Bot (String host, int port, int reconnectDelay, String username, List<Bot> allBots) {
public Bot (String host, int port, int reconnectDelay, String username, List<Bot> allBots, Map<String, String> keys) {
this.host = host;
this.port = port;
this.reconnectDelay = reconnectDelay;
this.username = username;
this.allBots = allBots;
this.keys = keys;
reconnect();
}

17
src/main/java/me/chayapak1/chomensbot_mabe/Configuration.java Normal file
View file

@ -0,0 +1,17 @@
package me.chayapak1.chomensbot_mabe;
import lombok.Getter;
import java.util.Map;
public class Configuration {
@Getter public int reconnectDelay = 7000;
@Getter public Map<String, String> keys;
@Getter public Bots[] bots = new Bots[]{};
public static class Bots {
@Getter public String host;
@Getter public int port;
@Getter public String username;
}
}

24
src/main/java/me/chayapak1/chomensbot_mabe/Main.java
View file

@ -2,6 +2,7 @@ package me.chayapak1.chomensbot_mabe;
import me.chayapak1.chomensbot_mabe.plugins.ConsolePlugin;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
import java.io.*;
import java.util.ArrayList;
@ -12,8 +13,9 @@ import java.util.concurrent.CountDownLatch;
public class Main {
public static void main(String[] args) throws IOException, InterruptedException {
final File file = new File("config.yml");
final Yaml yaml = new Yaml();
Map<String, List<Map<String, Object>>> config;
final Constructor constructor = new Constructor(Configuration.class);
final Yaml yaml = new Yaml(constructor);
Configuration config;
if (!file.exists()) {
// creates config file from default-config.yml
@ -41,21 +43,21 @@ public class Main {
config = yaml.load(reader);
final int reconnectDelay = (int) ((Object) config.get("reconnectDelay"));
List<Map<String, Object>> botsOptions = config.get("bots");
final int reconnectDelay = config.reconnectDelay();
final Map<String, String> keys = config.keys();
Configuration.Bots[] botsOptions = config.bots();
final List<Bot> allBots = new ArrayList<>();
final CountDownLatch latch = new CountDownLatch(botsOptions.size());
final CountDownLatch latch = new CountDownLatch(botsOptions.length);
for (Map<String, Object> botOption : botsOptions) {
final String host = (String) botOption.get("host");
final int port = (int) botOption.get("port");
final String username = (String) botOption.get("username");
for (Configuration.Bots botOption : botsOptions) {
final String host = botOption.host();
final int port = botOption.port();
final String username = botOption.username();
new Thread(() -> {
final Bot bot = new Bot(host, port, reconnectDelay, username, allBots);
final Bot bot = new Bot(host, port, reconnectDelay, username, allBots, keys);
allBots.add(bot);
latch.countDown();

7
src/main/java/me/chayapak1/chomensbot_mabe/command/CommandContext.java
View file

@ -7,8 +7,13 @@ import net.kyori.adventure.text.Component;
public class CommandContext {
@Getter public final Bot bot;
public CommandContext(Bot bot) {
@Getter private final String hash;
@Getter private final String ownerHash;
public CommandContext(Bot bot, String hash, String ownerHash) {
this.bot = bot;
this.hash = hash;
this.ownerHash = ownerHash;
}
public Component displayName () { return Component.empty(); }

5
src/main/java/me/chayapak1/chomensbot_mabe/command/ConsoleCommandContext.java
View file

@ -1,5 +1,6 @@
package me.chayapak1.chomensbot_mabe.command;
import lombok.Getter;
import me.chayapak1.chomensbot_mabe.Bot;
import me.chayapak1.chomensbot_mabe.util.ComponentUtilities;
import net.kyori.adventure.text.Component;
@ -8,8 +9,8 @@ import net.kyori.adventure.text.format.NamedTextColor;
public class ConsoleCommandContext extends CommandContext {
private final Bot bot;
public ConsoleCommandContext (Bot bot) {
super(bot);
public ConsoleCommandContext (Bot bot, String hash, String ownerHash) {
super(bot, hash, ownerHash);
this.bot = bot;
}

4
src/main/java/me/chayapak1/chomensbot_mabe/command/PlayerCommandContext.java
View file

@ -9,8 +9,8 @@ public class PlayerCommandContext extends CommandContext {
private final Bot bot;
public PlayerCommandContext (Bot bot, String playerName) {
super(bot);
public PlayerCommandContext (Bot bot, String playerName, String hash, String ownerHash) {
super(bot, hash, ownerHash);
this.bot = bot;
this.playerName = playerName;
}

4
src/main/java/me/chayapak1/chomensbot_mabe/commands/ValidateCommand.java
View file

@ -38,8 +38,8 @@ public class ValidateCommand implements Command {
final Bot bot = context.bot();
final String hash = fullArgs[0];
if (hash.equals(bot.hashing().hash())) context.sendOutput(Component.text("Valid hash").color(NamedTextColor.GREEN));
else if (hash.equals(bot.hashing().ownerHash())) context.sendOutput(Component.text("Valid OwnerHash").color(NamedTextColor.GREEN));
if (hash.equals(context.hash())) context.sendOutput(Component.text("Valid hash").color(NamedTextColor.GREEN));
else if (hash.equals(context.ownerHash())) context.sendOutput(Component.text("Valid OwnerHash").color(NamedTextColor.GREEN));
return Component.text("success");
}

2
src/main/java/me/chayapak1/chomensbot_mabe/plugins/ChatCommandHandlerPlugin.java
View file

@ -31,7 +31,7 @@ public class ChatCommandHandlerPlugin extends ChatPlugin.ChatListener {
if (!contents.startsWith(prefix)) return;
final String commandString = contents.substring(prefix.length());
final PlayerCommandContext context = new PlayerCommandContext(bot, displayName);
final PlayerCommandContext context = new PlayerCommandContext(bot, displayName, bot.hashing().hash(), bot.hashing().ownerHash());
final Component output = bot.commandHandler().executeCommand(commandString, context, bot.hashing().hash(), bot.hashing().ownerHash());
final String textOutput = ((TextComponent) output).content();

2
src/main/java/me/chayapak1/chomensbot_mabe/plugins/ConsolePlugin.java
View file

@ -77,7 +77,7 @@ public class ConsolePlugin {
if (!bot.host().equals(consoleServer) && !consoleServer.equals("all")) continue;
if (line.startsWith(prefix)) {
final ConsoleCommandContext context = new ConsoleCommandContext(bot);
final ConsoleCommandContext context = new ConsoleCommandContext(bot, "h", "o"); // ? should the hashes be hardcoded?
final Component output = bot.commandHandler().executeCommand(line.substring(prefix.length()), context, "h", "o");
final String textOutput = ((TextComponent) output).content();

11
src/main/java/me/chayapak1/chomensbot_mabe/plugins/HashingPlugin.java
View file

@ -9,17 +9,22 @@ import java.nio.charset.StandardCharsets;
import java.util.concurrent.TimeUnit;
public class HashingPlugin {
private final Bot bot;
@Getter private String hash;
@Getter private String ownerHash;
public HashingPlugin (Bot bot) {
this.bot = bot;
bot.executor().schedule(this::update, 2, TimeUnit.SECONDS);
}
public void update () {
final String ownerHashKey = "b)R<><52>nF<6E>CW<43><57><EFBFBD>#<23>\\[<5B>S*8\"t^eia<69>Z<EFBFBD><5A>k<EFBFBD><6B><EFBFBD><EFBFBD>K1<4B>8zȢ<7A>";
final String normalHashKey = "<EFBFBD>iB_D<EFBFBD><EFBFBD><EFBFBD>k<EFBFBD><EFBFBD>j8H<EFBFBD>{?[/ڭ<>f<EFBFBD>}Ѣ<>^-=<3D>Ț<EFBFBD><C89A>v]<5D><>g><3E><>=c";
// final String ownerHashKey = "b)R<><52>nF<6E>CW<43><57><EFBFBD>#<23>\\[<5B>S*8\"t^eia<69>Z<EFBFBD><5A>k<EFBFBD><6B><EFBFBD><EFBFBD>K1<4B>8zȢ<7A>";
// final String normalHashKey = "<EFBFBD>iB_D<EFBFBD><EFBFBD><EFBFBD>k<EFBFBD><EFBFBD>j8H<EFBFBD>{?[/ڭ<>f<EFBFBD>}Ѣ<>^-=<3D>Ț<EFBFBD><C89A>v]<5D><>g><3E><>=c";
final String normalHashKey = bot.keys().get("normalKey");
final String ownerHashKey = bot.keys().get("ownerKey");
final String hashValue = System.currentTimeMillis() / 10_000 + normalHashKey;
hash = Hashing.sha256()

3
src/main/resources/default-config.yml
View file

@ -1,4 +1,7 @@
reconnectDelay: 7000
keys:
normalKey: '<27>iB_D<5F><44><EFBFBD>k<EFBFBD><6B>j8H<38>{?[/ڭ<>f<EFBFBD>}Ѣ<>^-=<3D>Ț<EFBFBD><C89A>v]<5D><>g><3E><>=c'
ownerKey: 'b)R<><52>nF<6E>CW<43><57><EFBFBD>#<23>\\[<5B>S*8"t^eia<69>Z<EFBFBD><5A>k<EFBFBD><6B><EFBFBD><EFBFBD>K1<4B>8zȢ<7A>'
bots:
- host: 'localhost'
port: 25565