Skip to content

Commit 840aa57

Browse files
HausemasterIssueHausemasterIssue
authored
Cleanup
Cleanup
2 parents c64dda5 + d2d0ad4 commit 840aa57

File tree

5 files changed

+30
-51
lines changed

5 files changed

+30
-51
lines changed

‎src/main/java/dev/hause/squeakerbot/command/commands/AskGod.java‎

Lines changed: 9 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,25 @@
22

33
import java.util.Random;
44
import dev.hause.squeakerbot.command.Command;
5-
import net.minecraft.network.play.client.CPacketChatMessage;
5+
import dev.hause.squeakerbot.util.ChatUtil;
66

77
public class AskGod extends Command {
88

9+
private static String[] replies = {"> [SqueakerBot] It is certain.", "> [SqueakerBot] My sources say no.", "> [SqueakerBot] Absolutley.",
10+
"> [SqueakerBot] Never.", "> [SqueakerBot] Perhaps.", "> [SqueakerBot] Reply hazy. Ask again later.", "> [SqueakerBot] Based off your tone, no.",
11+
"> [SqueakerBot] In the future, yes.", "> [SqueakerBot] Better not tell you now.", "> [SqueakerBot] It is highly unlikely.",
12+
"> [SqueakerBot] Do not ask that question ever again.", "> [SqueakerBot] Yes.", "> [SqueakerBot] Not in a trillion years.", "> [SqueakerBot] I do not know.",
13+
"> [SqueakerBot] For sure.", "> [SqueakerBot] No."};
14+
15+
916
public AskGod() {
1017
super("AskGod", new String[] {"AskGod", "Ask"});
1118
}
1219

1320
@Override
1421
public void onRun() {
1522
Random random = new Random();
16-
int randomNum = random.nextInt((15 - 0) + 1) + 0;
17-
if(randomNum == 0) {
18-
mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] It is certain."));
19-
} else if (randomNum == 1) {
20-
mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] My sources say no."));
21-
} else if (randomNum == 2) {
22-
mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] Absolutley."));
23-
} else if (randomNum == 3) {
24-
mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] Never."));
25-
} else if (randomNum == 4) {
26-
mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] Perhaps."));
27-
} else if (randomNum == 5) {
28-
mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] Reply hazy. Ask again later."));
29-
} else if (randomNum == 6) {
30-
mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] Based off your tone, no."));
31-
} else if (randomNum == 7) {
32-
mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] In the future, yes."));
33-
} else if (randomNum == 8) {
34-
mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] Better not tell you now."));
35-
} else if (randomNum == 9) {
36-
mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] It is highly unlikely."));
37-
} else if (randomNum == 10) {
38-
mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] Do not ask that question ever again."));
39-
} else if (randomNum == 11) {
40-
mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] Yes."));
41-
} else if (randomNum == 12) {
42-
mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] Not in a trillion years."));
43-
} else if (randomNum == 13) {
44-
mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] I do not know."));
45-
} else if (randomNum == 14) {
46-
mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] For sure."));
47-
} else if (randomNum == 15) {
48-
mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] No."));
49-
}
23+
ChatUtil.sendChatMessage((replies[random.nextInt(14)]));
5024
}
5125

5226
}

‎src/main/java/dev/hause/squeakerbot/command/commands/CoinFlip.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
11
package dev.hause.squeakerbot.command.commands;
22

33
import java.util.Random;
4-
54
import dev.hause.squeakerbot.command.Command;
6-
import net.minecraft.network.play.client.CPacketChatMessage;
5+
import dev.hause.squeakerbot.util.ChatUtil;
76

87
public class CoinFlip extends Command {
98

9+
private static String[] outcomes = {"> [SqueakerBot] The coin flip results in Heads!", "> [SqueakerBot] The coin flip results in Tails!"};
10+
1011
public CoinFlip() {
1112
super("CoinFlip", new String[] {"CoinFlip", "Coin", "Flip"});
1213
}
1314

1415
@Override
1516
public void onRun() {
1617
Random random = new Random();
17-
int randomNum = random.nextInt((1 + 0) + 1) + 0;
18-
if(randomNum == 1) {
19-
mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] The coin flip results in Heads!"));
20-
} else if (randomNum == 0){
21-
mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] The coin flip results in Tails!"));
22-
}
18+
ChatUtil.sendChatMessage(outcomes[random.nextInt(2)]);
2319
}
2420

2521

‎src/main/java/dev/hause/squeakerbot/command/commands/Help.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.hause.squeakerbot.command.commands;
22

33
import dev.hause.squeakerbot.command.Command;
4-
import net.minecraft.network.play.client.CPacketChatMessage;
4+
import dev.hause.squeakerbot.util.ChatUtil;
55

66
public class Help extends Command {
77

@@ -11,7 +11,7 @@ public Help() {
1111

1212
@Override
1313
public void onRun() {
14-
mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] Commands (3): Help, CoinFlip, AskGod"));
14+
ChatUtil.sendChatMessage("> [SqueakerBot] Commands (3): Help, CoinFlip, AskGod");
1515
}
1616

1717
}

‎src/main/java/dev/hause/squeakerbot/listener/ChatListener.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import dev.hause.squeakerbot.command.Command;
88
import dev.hause.squeakerbot.command.CommandManager;
99
import net.minecraft.client.Minecraft;
10-
import net.minecraft.network.play.client.CPacketChatMessage;
1110
import net.minecraftforge.client.event.ClientChatReceivedEvent;
1211
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
1312

@@ -25,7 +24,7 @@ public void onChat(ClientChatReceivedEvent event) {
2524

2625
public void calcCommand(String input) {
2726
Random random = new Random();
28-
int waitTime = random.nextInt((3000 - 2000) + 1) + 2000;
27+
int waitTime = random.nextInt(3000);
2928
for(Command c : CommandManager.commands) {
3029
if(StringUtils.containsIgnoreCase(input, c.getCommand())) {
3130
Timer timer = new Timer();
@@ -39,9 +38,5 @@ public void run() {
3938
}
4039
}
4140
}
42-
43-
public void sendMessage(String s) {
44-
mc.player.connection.sendPacket(new CPacketChatMessage(s));
45-
}
4641

4742
}

‎src/main/java/dev/hause/squeakerbot/util/ChatUtil.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package dev.hause.squeakerbot.util;
2+
3+
import net.minecraft.client.Minecraft;
4+
import net.minecraft.network.play.client.CPacketChatMessage;
5+
6+
public class ChatUtil {
7+
8+
static Minecraft mc = Minecraft.getMinecraft();
9+
10+
public static void sendChatMessage(String message) {
11+
mc.player.connection.sendPacket(new CPacketChatMessage(message));
12+
}
13+
14+
}

0 commit comments

Comments
 (0)