Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Commands in chat case-insensitive #82

Merged
merged 3 commits into from
Jul 12, 2024
Merged

Commands in chat case-insensitive #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a58560
Introduce `Ambience` module
L1shed Jul 11, 2024
e3ab8dc
Commands are now case-insensitive
L1shed Jul 11, 2024
73299a3
Commands are now case-insensitive
L1shed Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/keystrokesmod/module/ModuleManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ public class ModuleManager {
public static StaffDetector staffDetector;
public static AutoRespawn autoRespawn;
public static Clutch clutch;
public static Ambience ambience;

public void register() {
this.addModule(autoClicker = new AutoClicker());
Expand Down Expand Up @@ -214,6 +215,7 @@ public void register() {
this.addModule(staffDetector = new StaffDetector());
this.addModule(new AutoWeapon());
this.addModule(autoRespawn = new AutoRespawn());
this.addModule(ambience = new Ambience());
antiBot.enable();
commandChat.enable();
modules.sort(Comparator.comparing(Module::getPrettyName));
Expand Down
82 changes: 82 additions & 0 deletions src/main/java/keystrokesmod/module/impl/render/Ambience.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
package keystrokesmod.module.impl.render;

import keystrokesmod.event.PreMotionEvent;
import keystrokesmod.event.ReceivePacketEvent;
import keystrokesmod.module.Module;
import keystrokesmod.module.setting.impl.ModeSetting;
import keystrokesmod.module.setting.impl.SliderSetting;
import net.minecraft.network.play.server.S03PacketTimeUpdate;
import net.minecraft.network.play.server.S2BPacketChangeGameState;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent;

public class Ambience extends Module {
private final SliderSetting time;
private final SliderSetting speed;
private final ModeSetting weather;


public Ambience() {
super("Ambience", category.render);
this.registerSetting(time = new SliderSetting("Time", 0,0, 24000, 10));
this.registerSetting(speed = new SliderSetting("Speed", 0,0, 20, 1));

String[] MODES = new String[]{"Unchanged", "Clear", "Rain"};
this.registerSetting(weather = new ModeSetting("Weather", MODES, 0));
}

@Override
public void onDisable() {
mc.theWorld.setRainStrength(0);
mc.theWorld.getWorldInfo().setCleanWeatherTime(Integer.MAX_VALUE);
mc.theWorld.getWorldInfo().setRainTime(0);
mc.theWorld.getWorldInfo().setThunderTime(0);
mc.theWorld.getWorldInfo().setRaining(false);
mc.theWorld.getWorldInfo().setThundering(false);
}

@SubscribeEvent
public void onRenderTick(TickEvent.RenderTickEvent event) {
mc.theWorld.setWorldTime((long) (time.getInput() + (System.currentTimeMillis() * speed.getInput())));
}

@SubscribeEvent
public void onPreMotion(PreMotionEvent event) {
if (mc.thePlayer.ticksExisted % 20 == 0) {

switch ((int) this.weather.getInput()) {
case 1: {
mc.theWorld.setRainStrength(0);
mc.theWorld.getWorldInfo().setCleanWeatherTime(Integer.MAX_VALUE);
mc.theWorld.getWorldInfo().setRainTime(0);
mc.theWorld.getWorldInfo().setThunderTime(0);
mc.theWorld.getWorldInfo().setRaining(false);
mc.theWorld.getWorldInfo().setThundering(false);
break;
}
case 2:
mc.theWorld.setRainStrength(1);
mc.theWorld.getWorldInfo().setCleanWeatherTime(0);
mc.theWorld.getWorldInfo().setRainTime(Integer.MAX_VALUE);
mc.theWorld.getWorldInfo().setThunderTime(Integer.MAX_VALUE);
mc.theWorld.getWorldInfo().setRaining(true);
mc.theWorld.getWorldInfo().setThundering(false);
}
}
}

@SubscribeEvent
public void onReceivePacket(ReceivePacketEvent event) {
if (event.getPacket() instanceof S03PacketTimeUpdate) {
event.setCanceled(true);
}

else if (event.getPacket() instanceof S2BPacketChangeGameState && this.weather.getInput() != 0) {
S2BPacketChangeGameState s2b = (S2BPacketChangeGameState) event.getPacket();

if (s2b.getGameState() == 1 || s2b.getGameState() == 2) {
event.setCanceled(true);
}
}
}
}
50 changes: 26 additions & 24 deletions src/main/java/keystrokesmod/utility/Commands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ public static void rCMD(@NotNull String c) {
List<String> args = Arrays.asList(c.split(" ")); // maybe bug
boolean hasArgs = args.size() > 1;
String n;
if (args.get(0).equals("setkey")) {
String firstArg = args.get(0).toLowerCase();

if (firstArg.equals("setkey")) {
if (!hasArgs) {
print(invSyn, 1);
return;
Expand All @@ -65,7 +67,7 @@ public static void rCMD(@NotNull String c) {
}

});
} else if (args.get(0).equals("nick")) {
} else if (firstArg.equals("nick")) {
if (!hasArgs) {
print(invSyn, 1);
return;
Expand All @@ -84,7 +86,7 @@ public static void rCMD(@NotNull String c) {
DuelsStats.nick = args.get(1);
print("&aNick has been set to:", 1);
print("\"" + DuelsStats.nick + "\"", 0);
} else if (args.get(0).equals("cname")) {
} else if (firstArg.equals("cname")) {
if (!hasArgs) {
print(invSyn, 1);
return;
Expand All @@ -99,7 +101,7 @@ public static void rCMD(@NotNull String c) {

print("&a" + Utils.uf("name") + "Nick has been set to:".substring(4), 1);
print("\"" + NameHider.n + "\"", 0);
} else if (args.get(0).equals(FakeChat.command)) {
} else if (firstArg.equals(FakeChat.command)) {
if (!hasArgs) {
print(invSyn, 1);
return;
Expand All @@ -113,7 +115,7 @@ public static void rCMD(@NotNull String c) {

FakeChat.msg = n;
print("&aMessage set!", 1);
} else if (args.get(0).equals("duels")) {
} else if (firstArg.equals("duels")) {
if (!hasArgs) {
print(invSyn, 1);
return;
Expand Down Expand Up @@ -151,7 +153,7 @@ public static void rCMD(@NotNull String c) {
}

});
} else if (args.get(0).equals("setspeed")) {
} else if (firstArg.equals("setspeed")) {
if (!hasArgs) {
print(invSyn, 1);
return;
Expand Down Expand Up @@ -184,7 +186,7 @@ public static void rCMD(@NotNull String c) {
}
print("&aSet speed to ", 1);
print(args.get(2), 0);
} else if (args.get(0).equals("setvelocity")) {
} else if (firstArg.equals("setvelocity")) {
if (!hasArgs) {
print(invSyn, 1);
return;
Expand Down Expand Up @@ -225,11 +227,11 @@ public static void rCMD(@NotNull String c) {

print("&aSet " + args.get(1) + " velocity to ", 1);
print(args.get(2), 0);
} else if (args.get(0).equals("ping")) {
} else if (firstArg.equals("ping")) {
Ping.checkPing();
} else if (args.get(0).equals("clear")) {
} else if (firstArg.equals("clear")) {
rs.clear();
} else if (args.get(0).equals("hide")) {
} else if (firstArg.equals("hide")) {
if (!hasArgs) {
print(invSyn, 1);
return;
Expand All @@ -247,7 +249,7 @@ public static void rCMD(@NotNull String c) {
print("&a" + module.getName() + " is now hidden in HUD", 1);
}
}
} else if (args.get(0).equals("show")) {
} else if (firstArg.equals("show")) {
if (!hasArgs) {
print(invSyn, 1);
return;
Expand All @@ -265,7 +267,7 @@ public static void rCMD(@NotNull String c) {
print("&a" + module.getName() + " is now visible in HUD", 1);
}
}
} else if (args.get(0).equals("panic")) {
} else if (firstArg.equals("panic")) {
List<Module> modulesToDisable = new ArrayList<>();
for (Module m : Raven.getModuleManager().getModules()) {
if (m.isEnabled()) {
Expand All @@ -276,7 +278,7 @@ public static void rCMD(@NotNull String c) {
m.disable();

}
}else if (args.get(0).equals("rename")) {
}else if (firstArg.equals("rename")) {
if (!hasArgs) {
print(invSyn, 1);
return;
Expand All @@ -294,14 +296,14 @@ public static void rCMD(@NotNull String c) {
print("&a" + module.getName() + " is now called " + module.getRawPrettyName(), 1);
}
}
} else if (args.get(0).equals("say")) {
} else if (firstArg.equals("say")) {
if (!hasArgs) {
print(invSyn, 1);
return;
}

PacketUtils.sendPacketNoEvent(new C01PacketChatMessage(c.substring(args.get(0).length() + 1)));
} else if (args.get(0).equals("setBName")) {
PacketUtils.sendPacketNoEvent(new C01PacketChatMessage(c.substring(firstArg.length() + 1)));
} else if (firstArg.equals("setbname")) {
if (!hasArgs) {
print(invSyn, 1);
return;
Expand All @@ -315,13 +317,13 @@ public static void rCMD(@NotNull String c) {
HUD.bName = args.get(1);

print("&aSet BName to " + HUD.bName, 1);
} else if (args.get(0).equals("binds")) {
} else if (firstArg.equals("binds")) {
for (Module module : Raven.getModuleManager().getModules()) {
if (module.getKeycode() != 0) {
print(ChatFormatting.AQUA + module.getName() + ": " + Keyboard.getKeyName(module.getKeycode()), 1);
}
}
} else if (args.get(0).equals("bind")) {
} else if (firstArg.equals("bind")) {
if (!hasArgs) {
print(invSyn, 1);
return;
Expand Down Expand Up @@ -352,7 +354,7 @@ public static void rCMD(@NotNull String c) {

targetModule.setBind(keyCode);
print(ChatFormatting.GREEN + "Bind '" + ChatFormatting.RESET + args.get(2) + ChatFormatting.GREEN + "' to " + targetModule.getPrettyName() + ".", 1);
} else if (args.get(0).equals("friend") || args.get(0).equals("f")) {
} else if (firstArg.equals("friend") || firstArg.equals("f")) {
if (!hasArgs) {
print(invSyn, 1);
return;
Expand All @@ -375,7 +377,7 @@ public static void rCMD(@NotNull String c) {
} else {
print("&aRemoved friend: " + args.get(1), 1);
}
} else if (args.get(0).equals("enemy") || args.get(0).equals("e")) {
} else if (firstArg.equals("enemy") || firstArg.equals("e")) {
if (!hasArgs) {
print(invSyn, 1);
return;
Expand All @@ -396,10 +398,10 @@ public static void rCMD(@NotNull String c) {
if (!added) {
print("&aRemoved enemy: " + args.get(1), 1);
}
} else if (args.get(0).equals("Debug".toLowerCase())) {
} else if (firstArg.equals("Debug".toLowerCase())) {
Raven.debugger = !Raven.debugger;
print("Debug " + (Raven.debugger ? "enabled" : "disabled") + ".", 1);
} else if (args.get(0).equals("profiles") || args.get(0).equals("p")) {
} else if (firstArg.equals("profiles") || firstArg.equals("p")) {
if (!hasArgs) {
print("&aAvailable profiles:", 1);
if (Raven.profileManager.profiles.isEmpty()) {
Expand Down Expand Up @@ -458,8 +460,8 @@ public static void rCMD(@NotNull String c) {
}
print("&cInvalid profile.", 1);
}
} else if (!args.get(0).equals("help") && !args.get(0).equals("?")) {
if (args.get(0).equals("shoutout")) {
} else if (!firstArg.equals("help") && !firstArg.equals("?")) {
if (firstArg.equals("shoutout")) {
print("&eCelebrities:", 1);
print("- hevex", 0);
print("- jc", 0);
Expand Down