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

InteractionMenu updates

Browse Source
This commit is contained in:
ThebestkillerTBK
2022-11-12 17:36:59 +08:00
committed by Cloudburst
parent bb7c6f016f
commit c4f4539a87
1 changed files with 49 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/main/java/anticope/rejects/modules/InteractionMenu.java
View File

@@ -4,7 +4,6 @@ import anticope.rejects.MeteorRejectsAddon;
import anticope.rejects.gui.screens.InteractionScreen; import anticope.rejects.gui.screens.InteractionScreen;
import it.unimi.dsi.fastutil.objects.Object2BooleanMap; import it.unimi.dsi.fastutil.objects.Object2BooleanMap;
import meteordevelopment.meteorclient.gui.GuiTheme; import meteordevelopment.meteorclient.gui.GuiTheme;
import meteordevelopment.meteorclient.gui.utils.CharFilter;
import meteordevelopment.meteorclient.gui.utils.StarscriptTextBoxRenderer; import meteordevelopment.meteorclient.gui.utils.StarscriptTextBoxRenderer;
import meteordevelopment.meteorclient.gui.widgets.WWidget; import meteordevelopment.meteorclient.gui.widgets.WWidget;
import meteordevelopment.meteorclient.gui.widgets.containers.WTable; import meteordevelopment.meteorclient.gui.widgets.containers.WTable;
@@ -19,7 +18,6 @@ import meteordevelopment.meteorclient.utils.misc.MeteorStarscript;
import meteordevelopment.meteorclient.utils.render.color.SettingColor; import meteordevelopment.meteorclient.utils.render.color.SettingColor;
import meteordevelopment.starscript.value.Value; import meteordevelopment.starscript.value.Value;
import meteordevelopment.starscript.value.ValueMap; import meteordevelopment.starscript.value.ValueMap;
import net.minecraft.client.render.debug.DebugRenderer; import net.minecraft.client.render.debug.DebugRenderer;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType; import net.minecraft.entity.EntityType;
@@ -27,7 +25,8 @@ import net.minecraft.entity.LivingEntity;
import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtString; import net.minecraft.nbt.NbtString;
import java.util.*; import java.util.HashMap;
import java.util.Optional;
public class InteractionMenu extends Module { public class InteractionMenu extends Module {
@@ -47,6 +46,12 @@ public class InteractionMenu extends Module {
.action(this::onKey) .action(this::onKey)
.build() .build()
); );
public final Setting<Boolean> useCrosshairTarget = sgGeneral.add(new BoolSetting.Builder()
.name("use-crosshair-target")
.description("Use crosshair target.")
.defaultValue(false)
.build()
);
// Style // Style
public final Setting<SettingColor> selectedDotColor = sgStyle.add(new ColorSetting.Builder() public final Setting<SettingColor> selectedDotColor = sgStyle.add(new ColorSetting.Builder()
@@ -70,33 +75,40 @@ public class InteractionMenu extends Module {
public final Setting<SettingColor> borderColor = sgStyle.add(new ColorSetting.Builder() public final Setting<SettingColor> borderColor = sgStyle.add(new ColorSetting.Builder()
.name("border-color") .name("border-color")
.description("Color of the border.") .description("Color of the border.")
.defaultValue(new SettingColor(0,0,0)) .defaultValue(new SettingColor(0, 0, 0))
.build() .build()
); );
public final Setting<SettingColor> textColor = sgStyle.add(new ColorSetting.Builder() public final Setting<SettingColor> textColor = sgStyle.add(new ColorSetting.Builder()
.name("text-color") .name("text-color")
.description("Color of the text.") .description("Color of the text.")
.defaultValue(new SettingColor(255,255,255)) .defaultValue(new SettingColor(255, 255, 255))
.build() .build()
); );
public final HashMap<String,String> messages = new HashMap<>(); public final HashMap<String, String> messages = new HashMap<>();
private String currMsgK = "", currMsgV = ""; private String currMsgK = "", currMsgV = "";
public InteractionMenu() { public InteractionMenu() {
super(MeteorRejectsAddon.CATEGORY,"interaction-menu","An interaction screen when looking at an entity."); super(MeteorRejectsAddon.CATEGORY, "interaction-menu", "An interaction screen when looking at an entity.");
MeteorStarscript.ss.set("entity", () -> wrap(InteractionScreen.interactionMenuEntity)); MeteorStarscript.ss.set("entity", () -> wrap(InteractionScreen.interactionMenuEntity));
} }
public void onKey() { public void onKey() {
if (mc.currentScreen != null) return; if (mc.player == null || mc.currentScreen != null) return;
Optional<Entity> lookingAt = DebugRenderer.getTargetedEntity(mc.player, 20); Entity e = null;
if (lookingAt.isPresent()) { if (useCrosshairTarget.get()) {
Entity e = lookingAt.get(); e = mc.targetedEntity;
if (entities.get().getBoolean(e.getType())) { } else {
mc.setScreen(new InteractionScreen(e, this)); Optional<Entity> lookingAt = DebugRenderer.getTargetedEntity(mc.player, 20);
if (lookingAt.isPresent()) {
e = lookingAt.get();
} }
} }
if (e == null) return;
if (entities.get().getBoolean(e.getType())) {
mc.setScreen(new InteractionScreen(e, this));
}
} }
@Override @Override
@@ -114,24 +126,21 @@ public class InteractionMenu extends Module {
WMinus delete = table.add(theme.minus()).widget(); WMinus delete = table.add(theme.minus()).widget();
delete.action = () -> { delete.action = () -> {
messages.remove(key); messages.remove(key);
fillTable(theme,table); fillTable(theme, table);
}; };
table.row(); table.row();
}); });
WTextBox textBoxK = table.add(theme.textBox(currMsgK)).minWidth(100).expandX().widget(); WTextBox textBoxK = table.add(theme.textBox(currMsgK)).minWidth(100).expandX().widget();
textBoxK.action = () -> { textBoxK.action = () -> currMsgK = textBoxK.get();
currMsgK = textBoxK.get();
};
WTextBox textBoxV = table.add(theme.textBox(currMsgV, (text1, c) -> true, StarscriptTextBoxRenderer.class)).minWidth(100).expandX().widget(); WTextBox textBoxV = table.add(theme.textBox(currMsgV, (text1, c) -> true, StarscriptTextBoxRenderer.class)).minWidth(100).expandX().widget();
textBoxV.action = () -> { textBoxV.action = () -> currMsgV = textBoxV.get();
currMsgV = textBoxV.get();
};
WPlus add = table.add(theme.plus()).widget(); WPlus add = table.add(theme.plus()).widget();
add.action = () -> { add.action = () -> {
if (currMsgK != "" && currMsgV != "") { if (!currMsgK.equals("") && !currMsgV.equals("")) {
messages.put(currMsgK, currMsgV); messages.put(currMsgK, currMsgV);
currMsgK = ""; currMsgV = ""; currMsgK = "";
fillTable(theme,table); currMsgV = "";
fillTable(theme, table);
} }
}; };
table.row(); table.row();
@@ -142,9 +151,7 @@ public class InteractionMenu extends Module {
NbtCompound tag = super.toTag(); NbtCompound tag = super.toTag();
NbtCompound messTag = new NbtCompound(); NbtCompound messTag = new NbtCompound();
messages.keySet().forEach((key) -> { messages.keySet().forEach((key) -> messTag.put(key, NbtString.of(messages.get(key))));
messTag.put(key, NbtString.of(messages.get(key)));
});
tag.put("messages", messTag); tag.put("messages", messTag);
return tag; return tag;
@@ -156,9 +163,7 @@ public class InteractionMenu extends Module {
messages.clear(); messages.clear();
if (tag.contains("messages")) { if (tag.contains("messages")) {
NbtCompound msgs = tag.getCompound("messages"); NbtCompound msgs = tag.getCompound("messages");
msgs.getKeys().forEach((key) -> { msgs.getKeys().forEach((key) -> messages.put(key, msgs.getString(key)));
messages.put(key, msgs.getString(key));
});
} }
return super.fromTag(tag); return super.fromTag(tag);
@@ -179,15 +184,15 @@ public class InteractionMenu extends Module {
); );
} }
return Value.map(new ValueMap() return Value.map(new ValueMap()
.set("_toString", Value.string(entity.getName().getString())) .set("_toString", Value.string(entity.getName().getString()))
.set("health", Value.number(entity instanceof LivingEntity e ? e.getHealth() : 0)) .set("health", Value.number(entity instanceof LivingEntity e ? e.getHealth() : 0))
.set("pos", Value.map(new ValueMap() .set("pos", Value.map(new ValueMap()
.set("_toString", posString(entity.getX(), entity.getY(), entity.getZ())) .set("_toString", posString(entity.getX(), entity.getY(), entity.getZ()))
.set("x", Value.number(entity.getX())) .set("x", Value.number(entity.getX()))
.set("y", Value.number(entity.getY())) .set("y", Value.number(entity.getY()))
.set("z", Value.number(entity.getZ())) .set("z", Value.number(entity.getZ()))
)) ))
.set("uuid", Value.string(entity.getUuidAsString())) .set("uuid", Value.string(entity.getUuidAsString()))
); );
} }