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

fard

Browse source
This commit is contained in:
Chayapak 2023-04-22 09:22:33 +07:00
parent 82dfc0bd7e
commit a31aefe855
2 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
.idea/workspace.xml
View file

@ -4,9 +4,8 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="50f184fa-7bed-4956-baf5-7586ff26ea08" name="Changes" comment="hopefully fix the broken players plugin"> <list default="true" id="50f184fa-7bed-4956-baf5-7586ff26ea08" name="Changes" comment="f">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/PlayersPlugin.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/PlayersPlugin.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -95,13 +94,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1680245437032</updated> <updated>1680245437032</updated>
</task> </task>
<task id="LOCAL-00042" summary="reduce more real">
<created>1681115395510</created>
<option name="number" value="00042" />
<option name="presentableId" value="LOCAL-00042" />
<option name="project" value="LOCAL" />
<updated>1681115395510</updated>
</task>
<task id="LOCAL-00043" summary="add translate"> <task id="LOCAL-00043" summary="add translate">
<created>1681194542547</created> <created>1681194542547</created>
<option name="number" value="00043" /> <option name="number" value="00043" />
@ -438,7 +430,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1682120738153</updated> <updated>1682120738153</updated>
</task> </task>
<option name="localTasksCounter" value="91" /> <task id="LOCAL-00091" summary="f">
<created>1682122055989</created>
<option name="number" value="00091" />
<option name="presentableId" value="LOCAL-00091" />
<option name="project" value="LOCAL" />
<updated>1682122055990</updated>
</task>
<option name="localTasksCounter" value="92" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
@ -453,7 +452,6 @@
</option> </option>
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="fix music list&#10;it took me ages to figure this out that i need to just &#10;CLONE THE LIST" />
<MESSAGE value="actually make creator configurable instead of hardcoding" /> <MESSAGE value="actually make creator configurable instead of hardcoding" />
<MESSAGE value="improve trusted plugin" /> <MESSAGE value="improve trusted plugin" />
<MESSAGE value="add among us to the position plugin (useful af)&#10;yes it is SOOOOOO good" /> <MESSAGE value="add among us to the position plugin (useful af)&#10;yes it is SOOOOOO good" />
@ -478,7 +476,8 @@
<MESSAGE value="ig fix music filename mabe mabe" /> <MESSAGE value="ig fix music filename mabe mabe" />
<MESSAGE value="probally fix bossbar plugin with actionbar mabe" /> <MESSAGE value="probally fix bossbar plugin with actionbar mabe" />
<MESSAGE value="hopefully fix the broken players plugin" /> <MESSAGE value="hopefully fix the broken players plugin" />
<option name="LAST_COMMIT_MESSAGE" value="hopefully fix the broken players plugin" /> <MESSAGE value="f" />
<option name="LAST_COMMIT_MESSAGE" value="f" />
</component> </component>
<component name="XSLT-Support.FileAssociations.UIState"> <component name="XSLT-Support.FileAssociations.UIState">
<expand /> <expand />

42
src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ChatPlugin.java
View file

@ -137,27 +137,28 @@ public class ChatPlugin extends SessionAdapter {
} }
private void sendChatTick () { private void sendChatTick () {
if (queue.size() == 0) return; try {
if (queue.size() == 0) return;
final String message = queue.get(0); final String message = queue.get(0);
final String[] splitted = message.split("(?<=\\G.{255})|\\n"); final String[] splitted = message.split("(?<=\\G.{255})|\\n");
for (String splitMessage : splitted) { for (String splitMessage : splitted) {
if (splitMessage.trim().equals("")) continue; if (splitMessage.trim().equals("")) continue;
if (splitMessage.startsWith("/")) { if (splitMessage.startsWith("/")) {
bot.session().send(new ServerboundChatCommandPacket( bot.session().send(new ServerboundChatCommandPacket(
splitMessage.substring(1), splitMessage.substring(1),
Instant.now().toEpochMilli(), Instant.now().toEpochMilli(),
0L, 0L,
Collections.emptyList(), Collections.emptyList(),
0, 0,
new BitSet() new BitSet()
)); ));
} else { } else {
// Temporary fix for the bot getting kicked instead of chatting // Temporary fix for the bot getting kicked instead of chatting
bot.core().run("essentials:sudo " + bot.players().getBotEntry().profile().getIdAsString() + " c:" + splitMessage); bot.core().run("essentials:sudo " + bot.players().getBotEntry().profile().getIdAsString() + " c:" + splitMessage);
// bot.session().send(new ServerboundChatPacket( // bot.session().send(new ServerboundChatPacket(
// splitMessage, // splitMessage,
// Instant.now().toEpochMilli(), // Instant.now().toEpochMilli(),
@ -166,10 +167,13 @@ public class ChatPlugin extends SessionAdapter {
// 0, // 0,
// new BitSet() // new BitSet()
// )); // ));
}
} }
}
queue.remove(0); queue.remove(0);
} catch (Exception e) {
e.printStackTrace();
}
} }
public void send (String message) { public void send (String message) {