From 81429cd517938c3f25c858016b3fb4fa91681627 Mon Sep 17 00:00:00 2001 From: iCaitlyn <55845572+iCaitlyn@users.noreply.github.com> Date: Wed, 9 Feb 2022 00:45:52 +0800 Subject: [PATCH 1/8] Update Data.java --- src/main/java/de/Linus122/TelegramChat/Data.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/de/Linus122/TelegramChat/Data.java b/src/main/java/de/Linus122/TelegramChat/Data.java index d2b0449..09a6019 100755 --- a/src/main/java/de/Linus122/TelegramChat/Data.java +++ b/src/main/java/de/Linus122/TelegramChat/Data.java @@ -9,12 +9,12 @@ public class Data { private String token = ""; // User ID : Player ID - private HashMap linkedChats = new HashMap(); + private HashMap linkedChats = new HashMap(); // Token : Player ID private HashMap linkCodes = new HashMap(); - public List chat_ids = new ArrayList(); + public List chat_ids = new ArrayList(); private boolean firstUse = true; @@ -28,11 +28,11 @@ public class Data { } // chats - public HashMap getLinkedChats() { + public HashMap getLinkedChats() { return linkedChats; } - public void setLinkedChats(HashMap linkedChats) { + public void setLinkedChats(HashMap linkedChats) { this.linkedChats = linkedChats; } @@ -44,11 +44,11 @@ public class Data { this.linkCodes = linkCodes; } - public List getIds() { + public List getIds() { return chat_ids; } - public void setIds(List ids) { + public void setIds(List ids) { this.chat_ids = ids; } @@ -60,7 +60,7 @@ public class Data { this.firstUse = firstUse; } - public void addChatPlayerLink(int chatID, UUID player) { + public void addChatPlayerLink(long chatID, UUID player) { linkedChats.put(chatID, player); } @@ -76,7 +76,7 @@ public class Data { linkCodes.remove(code); } - public UUID getUUIDFromUserID(int userID) { + public UUID getUUIDFromUserID(long userID) { return linkedChats.get(userID); } From 10fe3f3ad79880a3dc6cbbc4cabf8fa247c84c9e Mon Sep 17 00:00:00 2001 From: iCaitlyn <55845572+iCaitlyn@users.noreply.github.com> Date: Wed, 9 Feb 2022 00:47:49 +0800 Subject: [PATCH 2/8] Update TelegramChat.java --- src/main/java/de/Linus122/TelegramChat/TelegramChat.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/Linus122/TelegramChat/TelegramChat.java b/src/main/java/de/Linus122/TelegramChat/TelegramChat.java index 85a99f7..dedf337 100755 --- a/src/main/java/de/Linus122/TelegramChat/TelegramChat.java +++ b/src/main/java/de/Linus122/TelegramChat/TelegramChat.java @@ -139,20 +139,20 @@ public class TelegramChat extends JavaPlugin implements Listener { sendToMC(chatMsg.getUuid_sender(), chatMsg.getContent(), chatMsg.getChatID_sender()); } - private static void sendToMC(UUID uuid, String msg, int sender_chat) { + private static void sendToMC(UUID uuid, String msg, long sender_chat) { OfflinePlayer op = Bukkit.getOfflinePlayer(uuid); - List recievers = new ArrayList(); + List recievers = new ArrayList(); recievers.addAll(TelegramChat.data.chat_ids); recievers.remove((Object) sender_chat); String msgF = Utils.formatMSG("general-message-to-mc", op.getName(), msg)[0]; - for (int id : recievers) { + for (long id : recievers) { telegramHook.sendMsg(id, msgF.replaceAll("§.", "")); } Bukkit.broadcastMessage(msgF.replace("&", "§")); } - public static void link(UUID player, int userID) { + public static void link(UUID player, long userID) { TelegramChat.data.addChatPlayerLink(userID, player); OfflinePlayer p = Bukkit.getOfflinePlayer(player); telegramHook.sendMsg(userID, "Success! Linked " + p.getName()); From d0ee4ac4f584d7593663973889366f6d81bd9e1a Mon Sep 17 00:00:00 2001 From: iCaitlyn <55845572+iCaitlyn@users.noreply.github.com> Date: Wed, 9 Feb 2022 01:21:49 +0800 Subject: [PATCH 3/8] Update Telegram.java --- src/main/java/de/Linus122/Telegram/Telegram.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/Linus122/Telegram/Telegram.java b/src/main/java/de/Linus122/Telegram/Telegram.java index c249eb5..29f668f 100755 --- a/src/main/java/de/Linus122/Telegram/Telegram.java +++ b/src/main/java/de/Linus122/Telegram/Telegram.java @@ -108,7 +108,7 @@ public class Telegram { } else if (!chat.isPrivate()) { // group chat - int id = chat.getId(); + long id = chat.getId(); if (!TelegramChat.getBackend().chat_ids.contains(id)) TelegramChat.getBackend().chat_ids.add(id); @@ -127,7 +127,7 @@ public class Telegram { public void handleUserMessage(String text, Update update) { Chat chat = update.getMessage().getChat(); - int user_id = update.getMessage().getFrom().getId(); + long user_id = update.getMessage().getFrom().getId(); if (TelegramChat.getBackend().getLinkCodes().containsKey(text)) { // LINK TelegramChat.link(TelegramChat.getBackend().getUUIDFromLinkCode(text), user_id); @@ -148,7 +148,7 @@ public class Telegram { } } - public void sendMsg(int id, String msg) { + public void sendMsg(long id, String msg) { ChatMessageToTelegram chat = new ChatMessageToTelegram(); chat.chat_id = id; chat.text = msg; @@ -168,7 +168,7 @@ public class Telegram { public void sendAll(final ChatMessageToTelegram chat) { new Thread(new Runnable() { public void run() { - for (int id : TelegramChat.getBackend().chat_ids) { + for (long id : TelegramChat.getBackend().chat_ids) { chat.chat_id = id; // post("sendMessage", gson.toJson(chat, Chat.class)); sendMsg(chat); From 17ed5b5859718de5b13b9630878d7285f84f990f Mon Sep 17 00:00:00 2001 From: iCaitlyn <55845572+iCaitlyn@users.noreply.github.com> Date: Wed, 9 Feb 2022 01:22:39 +0800 Subject: [PATCH 4/8] Update Chat.java --- src/main/java/de/Linus122/TelegramComponents/Chat.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/Linus122/TelegramComponents/Chat.java b/src/main/java/de/Linus122/TelegramComponents/Chat.java index 51ac56f..f27d2b4 100644 --- a/src/main/java/de/Linus122/TelegramComponents/Chat.java +++ b/src/main/java/de/Linus122/TelegramComponents/Chat.java @@ -1,14 +1,14 @@ package de.Linus122.TelegramComponents; public class Chat { - private int id; + private long id; private String type; - public int getId() { + public long getId() { return id; } - public void setId(int id) { + public void setId(long id) { this.id = id; } From ca5f38e5fd23a28bf70264ff3f9cdc0d943d1e0d Mon Sep 17 00:00:00 2001 From: iCaitlyn <55845572+iCaitlyn@users.noreply.github.com> Date: Wed, 9 Feb 2022 01:23:08 +0800 Subject: [PATCH 5/8] Update ChatMessageToMc.java --- .../de/Linus122/TelegramComponents/ChatMessageToMc.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/Linus122/TelegramComponents/ChatMessageToMc.java b/src/main/java/de/Linus122/TelegramComponents/ChatMessageToMc.java index c2a9e1f..1a91732 100644 --- a/src/main/java/de/Linus122/TelegramComponents/ChatMessageToMc.java +++ b/src/main/java/de/Linus122/TelegramComponents/ChatMessageToMc.java @@ -5,9 +5,9 @@ import java.util.UUID; public class ChatMessageToMc extends Cancellable { UUID uuid_sender; String content; - int chatID_sender; + long chatID_sender; - public ChatMessageToMc(UUID uuid_sender, String content, int chatID_sender) { + public ChatMessageToMc(UUID uuid_sender, String content, long chatID_sender) { this.uuid_sender = uuid_sender; this.content = content; this.chatID_sender = chatID_sender; @@ -29,11 +29,11 @@ public class ChatMessageToMc extends Cancellable { this.content = content; } - public int getChatID_sender() { + public long getChatID_sender() { return chatID_sender; } - public void setChatID_sender(int chatID_sender) { + public void setChatID_sender(long chatID_sender) { this.chatID_sender = chatID_sender; } } From 5dee2150a8dd22f1391cf1746cc2f71a1b09ac65 Mon Sep 17 00:00:00 2001 From: iCaitlyn <55845572+iCaitlyn@users.noreply.github.com> Date: Wed, 9 Feb 2022 01:23:23 +0800 Subject: [PATCH 6/8] Update ChatMessageToTelegram.java --- .../de/Linus122/TelegramComponents/ChatMessageToTelegram.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/Linus122/TelegramComponents/ChatMessageToTelegram.java b/src/main/java/de/Linus122/TelegramComponents/ChatMessageToTelegram.java index 83e6a3f..b85a70c 100755 --- a/src/main/java/de/Linus122/TelegramComponents/ChatMessageToTelegram.java +++ b/src/main/java/de/Linus122/TelegramComponents/ChatMessageToTelegram.java @@ -2,6 +2,6 @@ package de.Linus122.TelegramComponents; public class ChatMessageToTelegram extends Cancellable { public String text; - public int chat_id; + public long chat_id; public String parse_mode; } From d6232f48462d1321c794e5442333aa2470999764 Mon Sep 17 00:00:00 2001 From: iCaitlyn <55845572+iCaitlyn@users.noreply.github.com> Date: Wed, 9 Feb 2022 01:24:12 +0800 Subject: [PATCH 7/8] Update User.java --- src/main/java/de/Linus122/TelegramComponents/User.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/Linus122/TelegramComponents/User.java b/src/main/java/de/Linus122/TelegramComponents/User.java index 7964ee7..fc42e84 100644 --- a/src/main/java/de/Linus122/TelegramComponents/User.java +++ b/src/main/java/de/Linus122/TelegramComponents/User.java @@ -1,16 +1,16 @@ package de.Linus122.TelegramComponents; public class User { - private int id; + private long id; private boolean is_bot; private String first_name; private String last_name; - public int getId() { + public long getId() { return id; } - public void setId(int id) { + public void setId(long id) { this.id = id; } From 62fc23beedfe82bf4f06af0d9e711d7da1cd140e Mon Sep 17 00:00:00 2001 From: iCaitlyn <55845572+iCaitlyn@users.noreply.github.com> Date: Wed, 9 Feb 2022 01:25:00 +0800 Subject: [PATCH 8/8] Update CommandHandler.java --- src/main/java/de/Linus122/Handlers/CommandHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/Linus122/Handlers/CommandHandler.java b/src/main/java/de/Linus122/Handlers/CommandHandler.java index 2cc7580..ef58eb0 100644 --- a/src/main/java/de/Linus122/Handlers/CommandHandler.java +++ b/src/main/java/de/Linus122/Handlers/CommandHandler.java @@ -27,7 +27,7 @@ import net.milkbowl.vault.permission.Permission; public class CommandHandler extends ConsoleHandler implements TelegramActionListener { private Permission permissionsAdapter; - private int lastChatId = -1; + private long lastChatId = -1; private long lastCommandTyped; private Telegram telegram;