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

Many improvements to AutoSign #4594

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Many improvements to AutoSign #4594

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b278167
remove hardcoded time placeholder
RealMuffinTime May 21, 2024
3962ca9
rewrite AutoSign, add many features
RealMuffinTime May 21, 2024
d70b6e4
code style :)
RealMuffinTime May 21, 2024
c030f16
more code style improvements
RealMuffinTime May 22, 2024
d306d73
remove date and timezone formating
RealMuffinTime May 22, 2024
1ececfe
restructure module
RealMuffinTime May 24, 2024
5839aae
add warning if second sign write is initially placed sign
RealMuffinTime May 31, 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
283 changes: 267 additions & 16 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/world/AutoSign.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,293 @@
package meteordevelopment.meteorclient.systems.modules.world;

import meteordevelopment.meteorclient.events.game.OpenScreenEvent;
import meteordevelopment.meteorclient.events.packets.PacketEvent;
import meteordevelopment.meteorclient.gui.GuiTheme;
import meteordevelopment.meteorclient.gui.widgets.containers.WHorizontalList;
import meteordevelopment.meteorclient.gui.widgets.pressable.WButton;
import meteordevelopment.meteorclient.gui.widgets.WWidget;
import meteordevelopment.meteorclient.gui.utils.StarscriptTextBoxRenderer;
import meteordevelopment.meteorclient.mixin.AbstractSignEditScreenAccessor;
import meteordevelopment.meteorclient.settings.*;
import meteordevelopment.meteorclient.systems.modules.Categories;
import meteordevelopment.meteorclient.systems.modules.Module;
import meteordevelopment.meteorclient.utils.misc.MeteorStarscript;
import meteordevelopment.orbit.EventHandler;
import meteordevelopment.starscript.Script;
import meteordevelopment.starscript.StandardLib;
import net.minecraft.block.entity.SignBlockEntity;
import net.minecraft.client.gui.screen.ingame.AbstractSignEditScreen;
import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket;
import net.minecraft.network.packet.c2s.play.PlayerInteractBlockC2SPacket;
import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
import net.minecraft.network.packet.c2s.play.UpdateSignC2SPacket;
import net.minecraft.text.Text;
import net.minecraft.util.Hand;
import net.minecraft.util.Util;
import net.minecraft.util.hit.BlockHitResult;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.TimeZone;

public class AutoSign extends Module {
private String[] text;

public AutoSign() {
super(Categories.World, "auto-sign", "Automatically writes signs. The first sign's text will be used.");
}
private boolean applyingBack = false;

private final SettingGroup front = settings.createGroup("Front");
private final SettingGroup back = settings.createGroup("Back");
private final SettingGroup other = settings.createGroup("Other");

private final List<Script> frontScripts = new ArrayList<>();
private final List<Script> backScripts = new ArrayList<>();

// 4 lines at front of sign
public final Setting<Boolean> frontEnabled = front.add(new BoolSetting.Builder()
.name("front-enabled")
.description("Enable auto writing front of sign.")
.defaultValue(true)
.build()
);

private final Setting<String> line1front = front.add(new StringSetting.Builder()
.name("front-line-1")
.description("Text in first line.")
.defaultValue("{player}")
.onChanged(strings -> recompile(front, frontScripts, 1))
.renderer(StarscriptTextBoxRenderer.class)
.visible(frontEnabled::get)
.build()
);

private final Setting<String> line2front = front.add(new StringSetting.Builder()
.name("front-line-2")
.description("Text in second line.")
.defaultValue("was here")
.onChanged(strings -> recompile(front, frontScripts, 2))
.renderer(StarscriptTextBoxRenderer.class)
.visible(frontEnabled::get)
.build()
);

private final Setting<String> line3front = front.add(new StringSetting.Builder()
.name("front-line-3")
.description("Text in third line.")
.defaultValue("{date}")
.onChanged(strings -> recompile(front, frontScripts, 3))
.renderer(StarscriptTextBoxRenderer.class)
.visible(frontEnabled::get)
.build()
);

private final Setting<String> line4front = front.add(new StringSetting.Builder()
.name("front-line-4")
.description("Text in fourth line.")
.defaultValue("{time}")
.onChanged(strings -> recompile(front, frontScripts, 4))
.renderer(StarscriptTextBoxRenderer.class)
.visible(frontEnabled::get)
.build()
);

// 4 lines at back of sign
public final Setting<Boolean> backEnabled = back.add(new BoolSetting.Builder()
.name("back-enabled")
.description("Enable auto writing back of sign.")
.defaultValue(true)
.build()
);

private final Setting<String> line1back = back.add(new StringSetting.Builder()
.name("back-line-1")
.description("Text in first line.")
.onChanged(strings -> recompile(back, backScripts, 1))
.renderer(StarscriptTextBoxRenderer.class)
.visible(backEnabled::get)
.build()
);

// It's MuffinTime.
private final Setting<String> line2back = back.add(new StringSetting.Builder()
.name("back-line-2")
.description("Text in second line.")
.defaultValue("It's MeteorTime.")
.onChanged(strings -> recompile(back, backScripts, 2))
.renderer(StarscriptTextBoxRenderer.class)
.visible(backEnabled::get)
.build()
);

private final Setting<String> line3back = back.add(new StringSetting.Builder()
.name("back-line-3")
.description("Text in third line.")
.onChanged(strings -> recompile(back, backScripts, 3))
.renderer(StarscriptTextBoxRenderer.class)
.visible(backEnabled::get)
.build()
);

private final Setting<String> line4back = back.add(new StringSetting.Builder()
.name("back-line-4")
.description("Text in fourth line.")
.onChanged(strings -> recompile(back, backScripts, 4))
.renderer(StarscriptTextBoxRenderer.class)
.visible(backEnabled::get)
.build()
);

// Other settings
public final Setting<Boolean> overwrite = other.add(new BoolSetting.Builder()
.name("overwrite-existing")
.description("Overwrite existing text on signs, when possible.")
.defaultValue(false)
.build());

private final Setting<String> date = other.add(new StringSetting.Builder()
.name("date-format")
.description("Format string for {date} object.")
.defaultValue("yyyy-MM-dd")
.build()
);

private final Setting<String> time = other.add(new StringSetting.Builder()
.name("time-format")
.description("Format string for {time} object.")
.defaultValue("HH:mm z")
.build()
);

private final Setting<Boolean> utcTimezone = other.add(new BoolSetting.Builder()
.name("UTC-timezone")
.description("Whether to use UTC or your local timezone.")
.defaultValue(true)
.build()
);

@Override
public void onDeactivate() {
text = null;
}
public WWidget getWidget(GuiTheme theme) {
WHorizontalList list = theme.horizontalList();

@EventHandler
private void onSendPacket(PacketEvent.Send event) {
if (!(event.packet instanceof UpdateSignC2SPacket)) return;
WButton starscriptDoc = theme.button("Open Starscript documentation.");
starscriptDoc.action = () -> Util.getOperatingSystem().open("https://github.com/MeteorDevelopment/meteor-client/wiki/Starscript");
list.add(starscriptDoc);

WButton simpleDateFormatDoc = theme.button("Open SimpleDateFormat documentation.");
simpleDateFormatDoc.action = () -> Util.getOperatingSystem().open("https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html");
list.add(simpleDateFormatDoc);

text = ((UpdateSignC2SPacket) event.packet).getText();
return list;
}

public AutoSign() {
super(Categories.World, "auto-sign", "Automatically writes signs. Configure what to write dynamically using Starscript placeholders.");
}

@EventHandler
private void onOpenScreen(OpenScreenEvent event) {
if (!(event.screen instanceof AbstractSignEditScreen) || text == null) return;
private void onOpenScreen(OpenScreenEvent event) throws InterruptedException {
if (!(event.screen instanceof AbstractSignEditScreen)) {return;}
if (applyingBack) {
applyingBack = false;
event.cancel();
return;
}

// apply custom format and timezone, not the nicest (temporary overwriting global date and time format)
try {
StandardLib.dateFormat.applyPattern(date.get());
StandardLib.timeFormat.applyPattern(time.get());
} catch (IllegalArgumentException e) {
error(e.getMessage());
}
if (utcTimezone.get()) {
StandardLib.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
StandardLib.timeFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
}

boolean updated = false;
SignBlockEntity sign = ((AbstractSignEditScreenAccessor) event.screen).getSign();

mc.player.networkHandler.sendPacket(new UpdateSignC2SPacket(sign.getPos(), true, text[0], text[1], text[2], text[3]));
if (frontEnabled.get()) {
boolean written = false;
for (Text text : sign.getFrontText().getMessages(false))
if (!Objects.equals(text.getString(), "") && !written) {
written = true;
}
if (overwrite.get() || !written) {
mc.player.networkHandler.sendPacket(new UpdateSignC2SPacket(sign.getPos(), true,
frontScripts.get(0) != null ? MeteorStarscript.run(frontScripts.get(0)) : "error",
frontScripts.get(1) != null ? MeteorStarscript.run(frontScripts.get(1)) : "error",
frontScripts.get(2) != null ? MeteorStarscript.run(frontScripts.get(2)) : "error",
frontScripts.get(3) != null ? MeteorStarscript.run(frontScripts.get(3)) : "error"));
updated = true;
}
}

// Start a second sign interaction (if applicable) to apply second side of sign
if (updated && backEnabled.get()) {
applyingBack = true;

// If sign was placed with offhand
boolean offhand_swapped = false;
if (!mc.player.getMainHandStack().getTranslationKey().endsWith("sign") && !mc.player.getMainHandStack().getTranslationKey().endsWith("air")) {
mc.player.networkHandler.sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.SWAP_ITEM_WITH_OFFHAND, mc.player.getBlockPos(), mc.player.getFacing()));
offhand_swapped = true;
}

boolean wasSneaking = mc.player.isSneaking();
if (wasSneaking) {
mc.player.networkHandler.sendPacket(new ClientCommandC2SPacket(mc.player, ClientCommandC2SPacket.Mode.RELEASE_SHIFT_KEY));
}

BlockHitResult bhr = new BlockHitResult(sign.getPos().toCenterPos(), mc.player.getFacing().getOpposite(), sign.getPos(), false);
mc.player.networkHandler.sendPacket(new PlayerInteractBlockC2SPacket(Hand.MAIN_HAND, bhr, 0));

if (wasSneaking) {
mc.player.networkHandler.sendPacket(new ClientCommandC2SPacket(mc.player, ClientCommandC2SPacket.Mode.PRESS_SHIFT_KEY));
}

if (offhand_swapped) {
mc.player.networkHandler.sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.SWAP_ITEM_WITH_OFFHAND, mc.player.getBlockPos(), mc.player.getFacing()));
}
}

if (backEnabled.get()) {
boolean written = false;
for (Text text : sign.getBackText().getMessages(false))
if (!Objects.equals(text.getString(), "") && !written) {
written = true;
}
if (overwrite.get() || !written) {
mc.player.networkHandler.sendPacket(new UpdateSignC2SPacket(sign.getPos(), false,
backScripts.get(0) != null ? MeteorStarscript.run(backScripts.get(0)) : "error",
backScripts.get(1) != null ? MeteorStarscript.run(backScripts.get(1)) : "error",
backScripts.get(2) != null ? MeteorStarscript.run(backScripts.get(2)) : "error",
backScripts.get(3) != null ? MeteorStarscript.run(backScripts.get(3)) : "error"));
updated = true;
}
}

// reset formating and timezones
StandardLib.dateFormat.applyPattern("dd. MM. yyyy");
StandardLib.timeFormat.applyPattern("HH:mm");
if (utcTimezone.get()) {
StandardLib.dateFormat.setTimeZone(TimeZone.getDefault());
StandardLib.timeFormat.setTimeZone(TimeZone.getDefault());
}

// When no sign side was updated open gui normally
if (updated) {
event.cancel();
}
}

private void recompile(SettingGroup side, List<Script> sideScripts, int line) {
String compileLine = (String) side.getByIndex(line).get();

Script script = MeteorStarscript.compile(compileLine);

event.cancel();
if (sideScripts.size() <= line - 1) {
sideScripts.add(script);
} else {
sideScripts.set(line - 1, script);
}
}
}
1 change: 0 additions & 1 deletion src/main/java/meteordevelopment/meteorclient/utils/misc/MeteorStarscript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ public static void init() {
ss.set("mc_version", SharedConstants.getGameVersion().getName());
ss.set("fps", () -> Value.number(MinecraftClientAccessor.getFps()));
ss.set("ping", MeteorStarscript::ping);
ss.set("time", () -> Value.string(LocalTime.now().format(DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT))));
ss.set("cps", () -> Value.number(CPSUtils.getCpsAverage()));

// Meteor
Expand Down
Loading