Skip to content

Commit 0355fc9

Browse files
ZgolyZgoly
authored
1.1 Update
1 parent c26056d commit 0355fc9

File tree

11 files changed

+259
-29
lines changed

11 files changed

+259
-29
lines changed

‎build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ repositories {
2222
}
2323

2424
dependencies {
25-
implementation 'com.thorstenmarx.modules:modules:2.8.0'
26-
2725
// Fabric
2826
minecraft "com.mojang:minecraft:${project.minecraft_version}"
2927
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"

‎gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ minecraft_version=1.18.2
66
yarn_mappings=1.18.2+build.2
77
loader_version=0.13.3
88
# Mod Properties
9-
mod_version=1.0
9+
mod_version=1.1
1010
maven_group=zgoly
1111
archives_base_name=meteorist
1212
# Dependencies

‎src/main/java/zgoly/meteorist/Meteorist.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
//By Zgoly
12
package zgoly.meteorist;
3+
4+
import meteordevelopment.meteorclient.systems.commands.Commands;
5+
import zgoly.meteorist.commands.Coordinates;
26
import zgoly.meteorist.modules.*;
37
import meteordevelopment.meteorclient.MeteorClient;
48
import meteordevelopment.meteorclient.addons.MeteorAddon;
@@ -16,13 +20,19 @@ public class Meteorist extends MeteorAddon {
1620

1721
@Override
1822
public void onInitialize() {
19-
LOG.info("Meteorist zxc 1000-7");
23+
LOG.info("Meteorist here!");
2024
MeteorClient.EVENT_BUS.registerLambdaFactory("zgoly.meteorist", (lookupInMethod, klass) -> (MethodHandles.Lookup) lookupInMethod.invoke(null, klass, MethodHandles.lookup()));
25+
// Modules
26+
Modules.get().add(new AutoTake());
2127
Modules.get().add(new AutoLeave());
2228
Modules.get().add(new AutoLogin());
2329
Modules.get().add(new ContainerCleaner());
30+
Modules.get().add(new JumpFlight());
2431
Modules.get().add(new NewVelocity());
32+
// Commands
33+
Commands.get().add(new Coordinates());
2534
}
35+
2636
@Override
2737
public void onRegisterCategories() {
2838
Modules.registerCategory(CATEGORY);

‎src/main/java/zgoly/meteorist/commands/Coordinates.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
//By Zgoly
2+
package zgoly.meteorist.commands;
3+
4+
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
5+
import meteordevelopment.meteorclient.systems.commands.Command;
6+
import net.minecraft.client.toast.SystemToast;
7+
import net.minecraft.command.CommandSource;
8+
import net.minecraft.text.LiteralText;
9+
10+
import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
11+
12+
public class Coordinates extends Command {
13+
public Coordinates() {
14+
super("coordinates", "Copies your coordinates to the clipboard.", "coords", "position", "pos");
15+
}
16+
17+
@Override
18+
public void build(LiteralArgumentBuilder<CommandSource> builder) {
19+
builder.executes(context -> {
20+
String s = ", ";
21+
String pos = mc.player.getBlockPos().getX() + s + mc.player.getBlockPos().getY() + s + mc.player.getBlockPos().getZ();
22+
mc.keyboard.setClipboard(pos);
23+
mc.getToastManager().add(new SystemToast(SystemToast.Type.TUTORIAL_HINT,
24+
new LiteralText("Coordinates copied"), new LiteralText("Paste, using Ctrl + V")));
25+
return SINGLE_SUCCESS;
26+
});
27+
}
28+
}

‎src/main/java/zgoly/meteorist/modules/AutoLeave.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,20 @@ public enum Mode {
2828
);
2929

3030
private final Setting<String> command = sgGeneral.add(new StringSetting.Builder()
31-
.name("command")
31+
.name("command:")
3232
.description("Send command in chat.")
3333
.defaultValue("/spawn")
3434
.visible(() -> mode.get() == Mode.Command)
3535
.build()
3636
);
3737

3838
private final Setting<Integer> range = sgGeneral.add(new IntSetting.Builder()
39-
.name("range")
39+
.name("range:")
4040
.description("Disconnects if player in range.")
4141
.defaultValue(5)
4242
.min(1)
43-
.range(1, 50)
43+
.range(1, 25)
44+
.sliderRange(1, 25)
4445
.build()
4546
);
4647

@@ -64,12 +65,10 @@ public AutoLeave() {
6465

6566
@EventHandler
6667
private void onTick(TickEvent.Post event) {
67-
assert mc.world != null;
6868
for (Entity entity : mc.world.getEntities()) {
6969
if (entity instanceof PlayerEntity) {
70-
assert mc.player != null;
7170
if (entity.getUuid() != mc.player.getUuid() && mc.player.distanceTo(entity) < range.get()) {
72-
if (ignoreFriends.get() && !Friends.get().isFriend((PlayerEntity) entity)) return;
71+
if (ignoreFriends.get() && Friends.get().isFriend((PlayerEntity) entity)) return;
7372
if (mode.get() == Mode.Logout)
7473
mc.player.networkHandler.onDisconnect(new DisconnectS2CPacket(new LiteralText("[AutoLeave] Found player in radius.")));
7574
else if (mode.get() == Mode.Command && !command.get().isEmpty()) mc.player.sendChatMessage(command.get());

‎src/main/java/zgoly/meteorist/modules/AutoLogin.java

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
//By Zgoly
22
package zgoly.meteorist.modules;
33

4-
import meteordevelopment.meteorclient.events.game.ReceiveMessageEvent;
4+
import meteordevelopment.meteorclient.events.game.GameLeftEvent;
5+
import meteordevelopment.meteorclient.events.world.TickEvent;
56
import meteordevelopment.meteorclient.settings.*;
67
import meteordevelopment.meteorclient.systems.modules.Module;
78
import meteordevelopment.orbit.EventHandler;
@@ -10,18 +11,52 @@
1011
public class AutoLogin extends Module {
1112
private final SettingGroup sgGeneral = settings.getDefaultGroup();
1213

13-
private final Setting<String> message = sgGeneral.add(new StringSetting.Builder()
14-
.name("")
15-
.defaultValue("/login 1234")
14+
private final Setting<String> logMsg = sgGeneral.add(new StringSetting.Builder()
15+
.name("login-message:")
16+
.description("Login message.")
17+
.defaultValue("/login")
1618
.build()
1719
);
1820

21+
private final Setting<Boolean> showPass = sgGeneral.add(new BoolSetting.Builder()
22+
.name("show-password")
23+
.description("Show password.")
24+
.defaultValue(false)
25+
.build()
26+
);
27+
28+
private final Setting<String> password = sgGeneral.add(new StringSetting.Builder()
29+
.name("your-password:")
30+
.description("Your password.")
31+
.defaultValue("1234")
32+
.visible(showPass::get)
33+
.build()
34+
);
35+
36+
private final Setting<Boolean> serverOnly = sgGeneral.add(new BoolSetting.Builder()
37+
.name("server-only")
38+
.description("Use Auto Login only on server.")
39+
.defaultValue(true)
40+
.build()
41+
);
42+
43+
boolean work = true;
44+
1945
public AutoLogin() {
2046
super(Meteorist.CATEGORY, "auto-login", "Automatically logs in your account.");
2147
}
2248

49+
//Shitty code anyway work
50+
@EventHandler
51+
private void onTick(TickEvent.Post event) {
52+
if (serverOnly.get() && mc.getServer() != null && mc.getServer().isSingleplayer()) return;
53+
if (!(logMsg.get().isEmpty() || password.get().isEmpty()) && work) {
54+
mc.player.sendChatMessage(logMsg.get() + " " + password.get());
55+
work = false;
56+
}
57+
}
2358
@EventHandler
24-
private void onMessageRecieve(ReceiveMessageEvent event) {
25-
if (!message.get().isEmpty()) mc.player.sendChatMessage(message.get());
59+
private void onGameLeft(GameLeftEvent event) {
60+
work = true;
2661
}
2762
}

‎src/main/java/zgoly/meteorist/modules/AutoTake.java

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
//By Zgoly
2+
package zgoly.meteorist.modules;
3+
4+
import meteordevelopment.meteorclient.events.world.TickEvent;
5+
import meteordevelopment.meteorclient.settings.*;
6+
import meteordevelopment.meteorclient.systems.modules.Module;
7+
import meteordevelopment.orbit.EventHandler;
8+
import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
9+
import net.minecraft.screen.slot.SlotActionType;
10+
import zgoly.meteorist.Meteorist;
11+
12+
public class AutoTake extends Module {
13+
public enum SlotActionTypes {
14+
THROW,
15+
QUICK_MOVE,
16+
SWAP,
17+
PICKUP
18+
}
19+
20+
private final SettingGroup sgGeneral = settings.getDefaultGroup();
21+
22+
private final Setting<SlotActionTypes> mode = sgGeneral.add(new EnumSetting.Builder<SlotActionTypes>()
23+
.name("mode")
24+
.description("The mode used.")
25+
.defaultValue(SlotActionTypes.THROW)
26+
.build()
27+
);
28+
29+
private final Setting<Integer> slot = sgGeneral.add(new IntSetting.Builder()
30+
.name("slot:")
31+
.description("Slot number to take. For example, in a double chest, \"1\" is the first slot, \"54\" is the last.")
32+
.defaultValue(1)
33+
.range(1, 90)
34+
.sliderRange(1, 90)
35+
.build()
36+
);
37+
38+
private final Setting<Integer> button = sgGeneral.add(new IntSetting.Builder()
39+
.name("button:")
40+
.description("\"0\" - left click, \"1\" - right click.")
41+
.defaultValue(0)
42+
.range(0, 1)
43+
.sliderRange(0, 1)
44+
.build()
45+
);
46+
47+
private final Setting<Integer> delay = sgGeneral.add(new IntSetting.Builder()
48+
.name("delay:")
49+
.description("Delay in ticks (1 sec = 20 ticks).")
50+
.defaultValue(10)
51+
.range(1, 40)
52+
.sliderRange(1, 40)
53+
.build()
54+
);
55+
56+
private int value = 0;
57+
58+
public AutoTake() {
59+
super(Meteorist.CATEGORY, "auto-take", "Automatically takes items from slot.");
60+
}
61+
62+
@EventHandler
63+
private void onTick(TickEvent.Post event) {
64+
if (value >= delay.get()) {
65+
value = 0;
66+
if (!(mc.currentScreen instanceof GenericContainerScreen)) return;
67+
mc.interactionManager.clickSlot(mc.player.currentScreenHandler.syncId, slot.get() - 1, button.get(), SlotActionType.valueOf(mode.get().name()), mc.player);
68+
} else value++;
69+
}
70+
71+
}

‎src/main/java/zgoly/meteorist/modules/ContainerCleaner.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,39 +23,39 @@ public enum Mode {
2323

2424
private final Setting<Mode> mode = sgGeneral.add(new EnumSetting.Builder<Mode>()
2525
.name("mode")
26-
.description("\"Blacklist\" - throw items from list; \"Whitelist\" - keep items from list, throw others")
26+
.description("\"Blacklist\" - throw items from list; \"Whitelist\" - keep items from list, throw others.")
2727
.defaultValue(Mode.Blacklist)
2828
.build()
2929
);
3030
private final Setting<Boolean> bThrowAngle = sgGeneral.add(new BoolSetting.Builder()
31-
.name("Throw angle")
32-
.description("For example, \"-30\" is throw over container, \"90\" is throw under your legs")
31+
.name("throw-angle")
32+
.description("For example, \"-30\" is throw over container, \"90\" is throw under your legs.")
3333
.defaultValue(true)
3434
.build()
3535
);
3636
private final Setting<Integer> throwAngle = sgGeneral.add(new IntSetting.Builder()
37-
.name("Throw angle")
38-
.description("For example, \"-30\" is throw over container, \"90\" is throw under your legs")
37+
.name("throw-angle:")
38+
.description("For example, \"-30\" is throw over container, \"90\" is throw under your legs.")
3939
.defaultValue(0)
4040
.range(-90, 90)
4141
.sliderRange(-90, 90)
4242
.visible(bThrowAngle::get)
4343
.build()
4444
);
4545

46-
private final Setting<List<Item>> Items = sgGeneral.add(new ItemListSetting.Builder()
47-
.name("Items")
46+
private final Setting<List<Item>> items = sgGeneral.add(new ItemListSetting.Builder()
47+
.name("items")
4848
.description("Items to throw/keep.")
4949
.build()
5050
);
5151

5252
private final Setting<Boolean> chests = sgGeneral.add(new BoolSetting.Builder()
53-
.name("Chests")
53+
.name("chests")
5454
.defaultValue(true)
5555
.build()
5656
);
5757
private final Setting<Boolean> shulkerBoxes = sgGeneral.add(new BoolSetting.Builder()
58-
.name("Shulker Boxes")
58+
.name("shulker-boxes")
5959
.defaultValue(true)
6060
.build()
6161
);
@@ -66,12 +66,12 @@ public ContainerCleaner() {
6666

6767
@EventHandler
6868
private void onTick(TickEvent.Post event) {
69-
if (Items.get().isEmpty()) return;
69+
if (items.get().isEmpty()) return;
7070
if (!(chests.get() && mc.currentScreen instanceof GenericContainerScreen
7171
|| shulkerBoxes.get() && mc.currentScreen instanceof ShulkerBoxScreen)) return;
7272
for (int i = 0; i < mc.player.currentScreenHandler.slots.size() - 36; i++) {
73-
if ((mode.get() == Mode.Blacklist) && !Items.get().contains(mc.player.currentScreenHandler.getSlot(i).getStack().getItem())) continue;
74-
if ((mode.get() == Mode.Whitelist) && Items.get().contains(mc.player.currentScreenHandler.getSlot(i).getStack().getItem())) continue;
73+
if ((mode.get() == Mode.Blacklist) && !items.get().contains(mc.player.currentScreenHandler.getSlot(i).getStack().getItem())) continue;
74+
if ((mode.get() == Mode.Whitelist) && items.get().contains(mc.player.currentScreenHandler.getSlot(i).getStack().getItem())) continue;
7575
if (bThrowAngle.get()) mc.getNetworkHandler().sendPacket(new PlayerMoveC2SPacket.LookAndOnGround(mc.player.getYaw(), throwAngle.get(), mc.player.isOnGround()));
7676
mc.interactionManager.clickSlot(mc.player.currentScreenHandler.syncId, i, 1, SlotActionType.THROW, mc.player);
7777
}

0 commit comments

Comments
 (0)