morpheus/Meteor-Rejects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

custom interactions now use starscript

Browse Source 
eg {entity.uuid}
This commit is contained in:
C10udburst
2022-02-19 15:55:14 +01:00
parent fce7e3a595
commit 3312d97b9f
2 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/anticope/rejects/gui/screens/InteractionScreen.java
View File

@@ -7,8 +7,14 @@ import com.mojang.blaze3d.systems.RenderSystem;
import meteordevelopment.meteorclient.MeteorClient;
import meteordevelopment.meteorclient.events.meteor.KeyEvent;
import meteordevelopment.meteorclient.systems.modules.Modules;
import meteordevelopment.meteorclient.utils.misc.MeteorStarscript;
import meteordevelopment.meteorclient.utils.render.PeekScreen;
import meteordevelopment.orbit.EventHandler;
import meteordevelopment.starscript.compiler.Compiler;
import meteordevelopment.starscript.compiler.Parser;
import meteordevelopment.starscript.utils.Error;
import meteordevelopment.starscript.utils.StarscriptError;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.ChatScreen;
import net.minecraft.client.gui.screen.Screen;
@@ -41,6 +47,8 @@ import java.util.function.Consumer;
*/
public class InteractionScreen extends Screen {
public static Entity interactionMenuEntity;
private final Entity entity;
private String focusedString = null;
private int crosshairX, crosshairY, focusedDot = -1;
@@ -141,12 +149,22 @@ public class InteractionScreen extends Screen {
}
msgs = Modules.get().get(InteractionMenu.class).messages;
msgs.keySet().forEach((key) -> {
if (msgs.get(key).contains("{username}") && !(entity instanceof PlayerEntity)) return;
if (msgs.get(key).contains("{health}") && !(entity instanceof LivingEntity)) return;
functions.put(key, (Entity e) -> {
closeScreen();
client.setScreen(new ChatScreen(replacePlaceholders(msgs.get(key), e)));
interactionMenuEntity = e;
var result = Parser.parse(msgs.get(key));
if (result.hasErrors()) {
for (Error error : result.errors) MeteorStarscript.printChatError(error);
return;
}
var script = Compiler.compile(result);
try {
client.setScreen(new ChatScreen(MeteorStarscript.ss.run(script)));
} catch (StarscriptError err) {
MeteorStarscript.printChatError(err);
return;
}
});
});
@@ -333,19 +351,6 @@ public class InteractionScreen extends Screen {
drawHorizontalLine(matrix, startX + 1, startX + 1, startY + 2, 0x80FFFFFF);
}
private String replacePlaceholders(String in, Entity e) {
in = in.replace("{uuid}", e.getUuidAsString());
in = in.replace("{name}", e.getName().getString());
in = in.replace("{pos}", String.format("%.2f %.2f %.2f", e.getX(), e.getY(), e.getZ()));
if (e instanceof PlayerEntity) {
in = in.replace("{username}", ((PlayerEntity)e).getGameProfile().getName());
}
if (e instanceof LivingEntity) {
in = in.replace("{health}", String.format("%.2f", ((LivingEntity)e).getHealth()));
}
return in;
}
private class StaticListener {
@EventHandler
private void onKey(KeyEvent event) {