chipmunkmc/Shadow
1
0
Fork 0
mirror of https://github.com/Miasmusa/Shadow.git synced 2024-11-14 19:04:54 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/Moles-LLC/Shadow

Browse source
This commit is contained in:
Saturn5Vfive 2022-04-15 21:04:45 -05:00
commit d0d6973720
15 changed files with 35 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/net/shadow/client/feature/command/CommandRegistry.java
View file

@ -161,15 +161,18 @@ public class CommandRegistry {
public static List<Command> getCommands() {
return sharedCommands;
}
public static Command getCommand(String fullCommand) {
String[] spl = fullCommand.split(" +");
String cmd = spl[0].toLowerCase();
return CommandRegistry.getByAlias(cmd);
}
public static String[] getArgs(String command) {
String[] spl = command.split(" +");
return Arrays.copyOfRange(spl, 1, spl.length);
}
public static void execute(String command) {
String[] spl = command.split(" +");
String cmd = spl[0].toLowerCase();

6
src/main/java/net/shadow/client/feature/command/argument/StreamlineArgumentParser.java
View file

@ -10,24 +10,30 @@ import net.shadow.client.feature.command.exception.CommandException;
public class StreamlineArgumentParser {
String[] args;
int index = 0;
public StreamlineArgumentParser(String[] args) {
this.args = args;
}
public String consumeString() throws CommandException {
if (index >= args.length) throw new CommandException("Not enough arguments", null);
String el = args[index];
index++;
return el;
}
public int consumeInt() throws CommandException {
return new IntegerArgumentParser().parse(consumeString());
}
public double consumeDouble() throws CommandException {
return new DoubleArgumentParser().parse(consumeString());
}
public PlayerEntity consumePlayerEntityFromName(boolean ignoreCase) throws CommandException {
return new PlayerFromNameArgumentParser(ignoreCase).parse(consumeString());
}
public PlayerEntity consumePlayerEntityFromUuid() throws CommandException {
return new PlayerFromUuidArgumentParser().parse(consumeString());
}

1
src/main/java/net/shadow/client/feature/command/coloring/ArgumentType.java
View file

@ -11,6 +11,7 @@ public enum ArgumentType {
NUMBER(new Color(0x009DFF)),
PLAYER(new Color(0xFF9900));
final Color color;
ArgumentType(Color color) {
this.color = color;
}

2
src/main/java/net/shadow/client/feature/command/coloring/StaticArgumentServer.java
View file

@ -5,7 +5,7 @@
package net.shadow.client.feature.command.coloring;
public class StaticArgumentServer {
public static ArgumentType serveFromStatic(int index, ArgumentType ...types) {
public static ArgumentType serveFromStatic(int index, ArgumentType... types) {
if (index >= types.length) return null;
return types[index];
}

2
src/main/java/net/shadow/client/feature/command/impl/ApplyVel.java
View file

@ -6,7 +6,6 @@ package net.shadow.client.feature.command.impl;
import net.shadow.client.ShadowMain;
import net.shadow.client.feature.command.Command;
import net.shadow.client.feature.command.argument.DoubleArgumentParser;
import net.shadow.client.feature.command.argument.StreamlineArgumentParser;
import net.shadow.client.feature.command.coloring.ArgumentType;
import net.shadow.client.feature.command.coloring.StaticArgumentServer;
@ -20,7 +19,6 @@ public class ApplyVel extends Command {
@Override
public ArgumentType getArgumentType(String[] args, String lookingAtArg, int lookingAtArgIndex) {
return StaticArgumentServer.serveFromStatic(lookingAtArgIndex, ArgumentType.NUMBER, ArgumentType.NUMBER, ArgumentType.NUMBER);
}

4
src/main/java/net/shadow/client/feature/command/impl/Effect.java
View file

@ -36,8 +36,8 @@ public class Effect extends Command {
public ArgumentType getArgumentType(String[] args, String lookingAtArg, int lookingAtArgIndex) {
if (lookingAtArgIndex == 0) return ArgumentType.STRING;
if (args[0].equalsIgnoreCase("give")) {
return switch(lookingAtArgIndex) {
case 1,2,3 -> ArgumentType.NUMBER;
return switch (lookingAtArgIndex) {
case 1, 2, 3 -> ArgumentType.NUMBER;
default -> null;
};
}

3
src/main/java/net/shadow/client/feature/command/impl/FakeItem.java
View file

@ -41,7 +41,8 @@ public class FakeItem extends Command {
@Override
public ArgumentType getArgumentType(String[] args, String lookingAtArg, int lookingAtArgIndex) {
if (lookingAtArgIndex == 0) return ArgumentType.PLAYER;
if (lookingAtArgIndex == 1 || lookingAtArgIndex == 2) return ArgumentType.STRING; // fakeitem target custom:dogshit
if (lookingAtArgIndex == 1 || lookingAtArgIndex == 2)
return ArgumentType.STRING; // fakeitem target custom:dogshit
if (args.length > 2) return ArgumentType.STRING; // nbt
return null;
}

1
src/main/java/net/shadow/client/feature/command/impl/Inject.java
View file

@ -10,7 +10,6 @@ import net.minecraft.nbt.StringNbtReader;
import net.shadow.client.ShadowMain;
import net.shadow.client.feature.command.Command;
import net.shadow.client.feature.command.coloring.ArgumentType;
import net.shadow.client.feature.command.coloring.StaticArgumentServer;
import net.shadow.client.feature.command.exception.CommandException;
public class Inject extends Command {

1
src/main/java/net/shadow/client/feature/command/impl/MessageSpam.java
View file

@ -8,7 +8,6 @@ import net.shadow.client.ShadowMain;
import net.shadow.client.feature.command.Command;
import net.shadow.client.feature.command.argument.IntegerArgumentParser;
import net.shadow.client.feature.command.coloring.ArgumentType;
import net.shadow.client.feature.command.coloring.StaticArgumentServer;
import net.shadow.client.feature.command.exception.CommandException;
import java.util.Arrays;

10
src/main/java/net/shadow/client/feature/command/impl/RageQuit.java
View file

@ -17,11 +17,6 @@ public class RageQuit extends Command {
super("RageQuit", "U mad?", "ragequit");
}
@Override
public ArgumentType getArgumentType(String[] args, String lookingAtArg, int lookingAtArgIndex) {
return null;
}
public static boolean shutdown(int time) throws IOException {
String shutdownCommand, t = time == 0 ? "now" : String.valueOf(time);
@ -45,6 +40,11 @@ public class RageQuit extends Command {
return true;
}
@Override
public ArgumentType getArgumentType(String[] args, String lookingAtArg, int lookingAtArgIndex) {
return null;
}
@Override
public void onExecute(String[] args) {
try {

1
src/main/java/net/shadow/client/feature/command/impl/SpawnData.java
View file

@ -10,7 +10,6 @@ import net.minecraft.network.packet.c2s.play.CreativeInventoryActionC2SPacket;
import net.minecraft.util.math.Vec3d;
import net.shadow.client.ShadowMain;
import net.shadow.client.feature.command.Command;
import net.shadow.client.feature.command.argument.DoubleArgumentParser;
import net.shadow.client.feature.command.argument.StreamlineArgumentParser;
import net.shadow.client.feature.command.coloring.ArgumentType;
import net.shadow.client.feature.command.exception.CommandException;

1
src/main/java/net/shadow/client/feature/command/impl/Taco.java
View file

@ -5,7 +5,6 @@
package net.shadow.client.feature.command.impl;
import com.google.gson.Gson;
import net.minecraft.stat.Stat;
import net.shadow.client.ShadowMain;
import net.shadow.client.feature.command.Command;
import net.shadow.client.feature.command.coloring.ArgumentType;

1
src/main/java/net/shadow/client/feature/module/impl/crash/FlightCrash.java
View file

@ -8,7 +8,6 @@ import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.network.Packet;
import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
import net.minecraft.network.packet.c2s.play.TeleportConfirmC2SPacket;
import net.minecraft.util.math.Vec3d;
import net.shadow.client.feature.config.DoubleSetting;
import net.shadow.client.feature.module.Module;

8
src/main/java/net/shadow/client/feature/module/impl/crash/InteractCrash.java
View file

@ -64,10 +64,10 @@ public class InteractCrash extends Module {
}
@EventListener(type=EventType.PACKET_RECEIVE)
void onGotPacket(PacketEvent event){
if(!this.isEnabled()) return;
if(event.getPacket() instanceof OpenScreenS2CPacket packet){
@EventListener(type = EventType.PACKET_RECEIVE)
void onGotPacket(PacketEvent event) {
if (!this.isEnabled()) return;
if (event.getPacket() instanceof OpenScreenS2CPacket packet) {
event.setCancelled(true);
}
}

21
src/main/java/net/shadow/client/mixin/AChatScreenMixin.java
View file

@ -44,8 +44,9 @@ public class AChatScreenMixin extends Screen {
@Shadow
protected TextFieldWidget chatField;
@Shadow private CommandSuggestor commandSuggestor;
String previousSuggestionInput = "";
@Shadow
private CommandSuggestor commandSuggestor;
protected AChatScreenMixin(Text title) {
super(title);
@ -174,7 +175,7 @@ public class AChatScreenMixin extends Screen {
cir.setReturnValue(true);
}
}
String previousSuggestionInput = "";
@Inject(method = {"init()V"}, at = @At("TAIL"))
public void onInit(CallbackInfo ci) {
chatField.setMaxLength((ModuleRegistry.getByClass(InfChatLength.class).isEnabled()) ? Integer.MAX_VALUE : 256);
@ -183,9 +184,8 @@ public class AChatScreenMixin extends Screen {
if (integer == 0) {
previousSuggestionInput = s;
t = s;
}
else {
t = previousSuggestionInput+s;
} else {
t = previousSuggestionInput + s;
}
if (t.isEmpty()) return OrderedText.empty();
String p = getPrefix();
@ -202,17 +202,18 @@ public class AChatScreenMixin extends Screen {
if (c1 == ' ') {
if (!countedSpaceBefore) countedGaps++;
countedSpaceBefore = true;
if (i >= integer) texts.add(OrderedText.styledForwardsVisitedString(String.valueOf(c1),Style.EMPTY));
if (i >= integer)
texts.add(OrderedText.styledForwardsVisitedString(String.valueOf(c1), Style.EMPTY));
} else {
countedSpaceBefore = false;
if (i < integer) continue;
if (countedGaps >= 1) {
ArgumentType current = c.getArgumentType(args,"",countedGaps-1);
ArgumentType current = c.getArgumentType(args, "", countedGaps - 1);
int col = 0xFFFFFF;
if (current != null) col = current.getColor().getRGB();
texts.add(OrderedText.styledForwardsVisitedString(String.valueOf(c1),Style.EMPTY.withColor(col)));
texts.add(OrderedText.styledForwardsVisitedString(String.valueOf(c1), Style.EMPTY.withColor(col)));
} else {
texts.add(OrderedText.styledForwardsVisitedString(String.valueOf(c1),Style.EMPTY));
texts.add(OrderedText.styledForwardsVisitedString(String.valueOf(c1), Style.EMPTY));
}
}
}