Skip to content

Commit 6baf005

Browse files
author
zgoly
committed
1.11
1 parent ceeb063 commit 6baf005

File tree

72 files changed

+4223
-594
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+4223
-594
lines changed

‎README.md

Lines changed: 39 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -53,49 +53,56 @@ To download the addon, follow these steps:
5353
[![Join Discord][shield-discord-server]][discord]
5454
[![Join Discord][shield-discord-members]][discord]
5555

56-
| № | Module | Description |
57-
|----|-------------------------------------------------------------------|-----------------------------------------------------------------------------|
58-
| 1 | [Auto Feed](../../wiki/modules#auto-feed) | Writes command in chat when hunger level is low. |
59-
| 2 | [Auto Fix](../../wiki/modules#auto-fix) | Writes command in chat when item close to break. |
60-
| 3 | [Auto Heal](../../wiki/modules#auto-heal) | Writes command in chat when health level is low. |
61-
| 4 | [Auto Interact](../../wiki/modules#auto-interact) | Automatically interact with interactable blocks like doors, trapdoors, etc. |
62-
| 5 | [Auto Leave](../../wiki/modules#auto-leave) | Automatically leaves if entity in range. |
63-
| 6 | [Auto Login](../../wiki/modules#auto-login) | Automatically logs in your account using /login. |
64-
| 7 | [Auto Mud](../../wiki/modules#auto-mud) | Automatically uses water bottle on dirt variants to get mud. |
65-
| 8 | [Auto Sleep](../../wiki/modules#auto-sleep) | Gets into bed automatically for you. |
66-
| 9 | [Auto Sneak](../../wiki/modules#auto-sneak) | Automatically sneaks at block edge (idea by kokqi). |
67-
| 10 | [Auto Trade](../../wiki/modules#auto-trade) | Automatically trades items with villagers (idea by Hiradpi). |
68-
| 11 | [Boat Control](../../wiki/modules#boat-control) | Automatically controls the boat for you. |
69-
| 12 | [Disconnect Sound](../../wiki/modules#disconnect-sound) | Plays a sound when the Disconnected Screen appears (e.g., when kicked). |
70-
| 13 | [Dm Spam](../../wiki/modules#dm-spam) | Spams messages in players direct messages. |
71-
| 14 | [Double Doors Interact](../../wiki/modules#double-doors-interact) | Open both doors with one interaction. |
72-
| 15 | [Entity Interact](../../wiki/modules#entity-interact) | Automatically interacts with entities in range. |
73-
| 16 | [Grid](../../wiki/modules#grid) | Allows you to place blocks on a grid. |
74-
| 17 | [Instructions](../../wiki/modules#instructions) | Runs commands one by one with different delays and number of cycles. |
75-
| 18 | [Item Sucker](../../wiki/modules#item-sucker) | Automatically collects items on the ground |
76-
| 19 | [Jump Flight](../../wiki/modules#jump-flight) | Flight that using jumps for fly. No fall recommended. |
77-
| 20 | [Jump Jump](../../wiki/modules#jump-jump) | Makes you jump higher than normal using multiple jumps. |
78-
| 21 | [Placer](../../wiki/modules#placer) | Places blocks in range. |
79-
| 22 | [Slot Click](../../wiki/modules#slot-click) | Module that automates clicking on slots. |
80-
| 23 | [Z Aimbot](../../wiki/modules#z-aimbot) | Smart aimbot that takes many settings into account when targeting. |
81-
| 24 | [Z Kill Aura](../../wiki/modules#z-kill-aura) | Killaura which only attacks target if you aim at it. |
56+
| № | Module | Description |
57+
|----|-------------------------------------------------------------------|--------------------------------------------------------------------------------|
58+
| 1 | [Auto Crafter](../../wiki/modules#auto-crafter) | Automatically craft items. |
59+
| 2 | [Auto Feed](../../wiki/modules#auto-feed) | Writes command in chat when hunger level is low. |
60+
| 3 | [Auto Fix](../../wiki/modules#auto-fix) | Writes command in chat when item close to break. |
61+
| 4 | [Auto Heal](../../wiki/modules#auto-heal) | Writes command in chat when health level is low. |
62+
| 5 | [Auto Interact](../../wiki/modules#auto-interact) | Automatically interacts with interactable blocks like doors, trapdoors, etc. |
63+
| 6 | [Auto Leave](../../wiki/modules#auto-leave) | Automatically leaves if player with specific name joins the server. |
64+
| 7 | [Auto Login](../../wiki/modules#auto-login) | Automatically logs in your account using /login. |
65+
| 8 | [Auto Mud](../../wiki/modules#auto-mud) | Automatically uses water bottle on dirt variants to get mud. |
66+
| 9 | [Auto Sleep](../../wiki/modules#auto-sleep) | Gets into bed automatically for you. |
67+
| 10 | [Auto Sneak](../../wiki/modules#auto-sneak) | Automatically sneaks at block edge (idea by kokqi). |
68+
| 11 | [Auto Trade](../../wiki/modules#auto-trade) | Automatically trades items with villagers (idea by Hiradpi). |
69+
| 12 | [Boat Control](../../wiki/modules#boat-control) | Automatically controls the boat for you. |
70+
| 13 | [Disconnect Sound](../../wiki/modules#disconnect-sound) | Plays a sound when the Disconnected Screen appears (e.g., when kicked). |
71+
| 14 | [Dm Spam](../../wiki/modules#dm-spam) | Spams messages in players direct messages. |
72+
| 15 | [Double Doors Interact](../../wiki/modules#double-doors-interact) | Open both doors with one interaction. |
73+
| 16 | [Entity Interact](../../wiki/modules#entity-interact) | Automatically interacts with entities in range. |
74+
| 17 | [Grid](../../wiki/modules#grid) | Allows you to place blocks on a grid. |
75+
| 18 | [Instructions](../../wiki/modules#instructions) | Runs commands with different delays and number of cycles. Supports Starscript. |
76+
| 19 | [Item Sucker](../../wiki/modules#item-sucker) | Automatically picks up dropped items. |
77+
| 20 | [Jump Flight](../../wiki/modules#jump-flight) | Flight that using jumps for fly. No fall recommended. |
78+
| 21 | [Jump Jump](../../wiki/modules#jump-jump) | Makes you jump higher than normal using multiple jumps. |
79+
| 22 | [Nerd Vision](../../wiki/modules#nerd-vision) | Allows you to visualize various game mechanics/farms. |
80+
| 23 | [Placer](../../wiki/modules#placer) | Places blocks in range. |
81+
| 24 | [Range Actions](../../wiki/modules#range-actions) | Combined functionality of different range actions. |
82+
| 25 | [Slot Click](../../wiki/modules#slot-click) | Module that automates clicking on slots. |
83+
| 26 | [Z Aimbot](../../wiki/modules#z-aimbot) | Smart aimbot that takes many settings into account when targeting. |
84+
| 27 | [Z Kill Aura](../../wiki/modules#z-kill-aura) | Killaura which only attacks target if you aim at it. |
85+
| 28 | [Zoom Plus](../../wiki/modules#zoom-plus) | Advanced Zoom module with more customizable settings. |
8286

8387
## 📘 Commands
8488

8589
[![Join Discord][shield-discord-server]][discord]
8690
[![Join Discord][shield-discord-members]][discord]
8791

88-
| № | Command | Description |
89-
|---|--------------------------------------------------|--------------------------------------------------------------------------|
90-
| 1 | [`coordinates`](../../wiki/commands#coordinates) | Copies your coordinates to the clipboard. |
91-
| 2 | [`data`](../../wiki/commands#data) | Gets NBT data of entities or blocks. |
92-
| 3 | [`playersinfo`](../../wiki/commands#playersinfo) | Saves in file / copies to clipboard info about players on current server |
92+
| № | Command | Description |
93+
|---|----------------------------------------------------|---------------------------------------------------------------------------|
94+
| 1 | [`data`](../../wiki/commands#data) | Gets NBT data of entities or blocks. |
95+
| 2 | [`instructions`](../../wiki/commands#instructions) | Runs saved instructions from the "Instructions" module. |
96+
| 3 | [`interact`](../../wiki/commands#interact) | Interact with closest block. |
97+
| 4 | [`playersinfo`](../../wiki/commands#playersinfo) | Saves in file / copies to clipboard info about players on current server. |
9398

9499
## 🎨 Presets
95100

96101
[![Join Discord][shield-discord-server]][discord]
97102
[![Join Discord][shield-discord-members]][discord]
98103

104+
Additional presets for Meteor.
105+
99106
| № | Title | Text |
100107
|---|-----------------------------------------------------------|----------------------------------------------------------------|
101108
| 1 | [Fall Damage](../../wiki/presets#fall-damage) | `Fall damage: #1{round(meteorist.fall_damage) / 2} ❤` |
@@ -156,4 +163,4 @@ To download the addon, follow these steps:
156163
[report-bug]: https://github.com/Zgoly/Meteorist/issues/new?assignees=&labels=bug&projects=&template=bug.yml
157164

158165
[shield-report-crash]: https://img.shields.io/badge/Report%20a%20crash-c83232
159-
[report-crash]: https://github.com/Zgoly/Meteorist/issues/new?assignees=&labels=crash&projects=&template=crash.yml
166+
[report-crash]: https://github.com/Zgoly/Meteorist/issues/new?assignees=&labels=crash&projects=&template=crash.yml

‎build.gradle

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎build.gradle.kts

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
plugins {
2+
id("fabric-loom") version "1.9-SNAPSHOT"
3+
}
4+
5+
base {
6+
archivesName = properties["archives_base_name"] as String
7+
version = properties["mod_version"] as String
8+
group = properties["maven_group"] as String
9+
}
10+
11+
repositories {
12+
maven {
13+
name = "meteor-maven"
14+
url = uri("https://maven.meteordev.org/releases")
15+
}
16+
maven {
17+
name = "meteor-maven-snapshots"
18+
url = uri("https://maven.meteordev.org/snapshots")
19+
}
20+
}
21+
22+
dependencies {
23+
// Fabric
24+
minecraft("com.mojang:minecraft:${properties["minecraft_version"] as String}")
25+
mappings("net.fabricmc:yarn:${properties["yarn_mappings"] as String}:v2")
26+
modImplementation("net.fabricmc:fabric-loader:${properties["loader_version"] as String}")
27+
28+
// Meteor
29+
modImplementation("meteordevelopment:meteor-client:${properties["minecraft_version"] as String}-SNAPSHOT")
30+
31+
// Baritone (https://github.com/MeteorDevelopment/baritone)
32+
modCompileOnly("meteordevelopment:baritone:${properties["baritone_version"] as String}-SNAPSHOT")
33+
}
34+
35+
loom {
36+
accessWidenerPath = file("src/main/resources/meteorist.accesswidener")
37+
}
38+
39+
tasks {
40+
processResources {
41+
val propertyMap = mapOf(
42+
"version" to project.version,
43+
"mc_version" to project.property("minecraft_version"),
44+
)
45+
46+
filesMatching("fabric.mod.json") {
47+
expand(propertyMap)
48+
}
49+
}
50+
51+
jar {
52+
val licenseSuffix = project.base.archivesName.get()
53+
from("LICENSE") {
54+
rename { "${it}_${licenseSuffix}" }
55+
}
56+
}
57+
58+
java {
59+
sourceCompatibility = JavaVersion.VERSION_21
60+
targetCompatibility = JavaVersion.VERSION_21
61+
}
62+
63+
withType<JavaCompile> {
64+
options.encoding = "UTF-8"
65+
options.release = 21
66+
}
67+
}

‎gradle.properties

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
1-
org.gradle.jvmargs=-Xmx2G
1+
org.gradle.jvmargs=-Xmx1G
22

3-
# Fabric Properties (https://fabricmc.net/versions.html)
4-
minecraft_version=1.21
5-
yarn_mappings=1.21+build.2
6-
loader_version=0.15.11
3+
# Fabric Properties (https://fabricmc.net/develop)
4+
minecraft_version=1.21.4
5+
yarn_mappings=1.21.4+build.8
6+
loader_version=0.16.10
77

88
# Mod Properties
9-
mod_version=1.10
9+
mod_version=1.11
1010
maven_group=zgoly
1111
archives_base_name=meteorist
1212

1313
# Dependencies
14-
15-
# Meteor (https://maven.meteordev.org)
16-
meteor_version=0.5.8-SNAPSHOT
17-
1814
# Baritone (https://github.com/MeteorDevelopment/baritone)
19-
baritone_version=1.20.6
15+
baritone_version=1.21.4

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎settings.gradle renamed to ‎settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
pluginManagement {
22
repositories {
33
maven {
4-
name = 'Fabric'
5-
url = 'https://maven.fabricmc.net/'
4+
name = "Fabric"
5+
url = uri("https://maven.fabricmc.net/")
66
}
77
mavenCentral()
88
gradlePluginPortal()

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,18 @@
1313
import net.minecraft.util.Identifier;
1414
import org.slf4j.Logger;
1515
import org.slf4j.LoggerFactory;
16-
import zgoly.meteorist.commands.CoordinatesCommand;
1716
import zgoly.meteorist.commands.DataCommand;
17+
import zgoly.meteorist.commands.InstructionsCommand;
18+
import zgoly.meteorist.commands.InteractCommand;
1819
import zgoly.meteorist.commands.PlayersInfoCommand;
1920
import zgoly.meteorist.hud.TextPresets;
2021
import zgoly.meteorist.modules.*;
22+
import zgoly.meteorist.modules.autocrafter.AutoCrafter;
2123
import zgoly.meteorist.modules.autologin.AutoLogin;
2224
import zgoly.meteorist.modules.autotrade.AutoTrade;
2325
import zgoly.meteorist.modules.instructions.Instructions;
2426
import zgoly.meteorist.modules.placer.Placer;
27+
import zgoly.meteorist.modules.rangeactions.RangeActions;
2528
import zgoly.meteorist.modules.slotclick.SlotClick;
2629
import zgoly.meteorist.settings.StringPairSetting;
2730
import zgoly.meteorist.utils.misc.MeteoristStarscript;
@@ -48,6 +51,10 @@ public class Meteorist extends MeteorAddon {
4851
public static GuiTexture COPY;
4952
public static GuiTexture EYE;
5053

54+
public static Identifier identifier(String path) {
55+
return Identifier.of(MOD_ID, path);
56+
}
57+
5158
@Override
5259
public void onInitialize() {
5360
// Log random message
@@ -60,6 +67,7 @@ public void onInitialize() {
6067

6168
// Modules
6269
LOG.info("Registering modules...");
70+
Modules.get().add(new AutoCrafter());
6371
Modules.get().add(new AutoFeed());
6472
Modules.get().add(new AutoFix());
6573
Modules.get().add(new AutoHeal());
@@ -82,13 +90,17 @@ public void onInitialize() {
8290
Modules.get().add(new JumpJump());
8391
Modules.get().add(new Placer());
8492
Modules.get().add(new SlotClick());
93+
Modules.get().add(new NerdVision());
94+
Modules.get().add(new RangeActions());
8595
Modules.get().add(new ZAimbot());
8696
Modules.get().add(new ZKillaura());
97+
Modules.get().add(new ZoomPlus());
8798

8899
// Commands
89100
LOG.info("Registering commands...");
90-
Commands.add(new CoordinatesCommand());
91101
Commands.add(new DataCommand());
102+
Commands.add(new InstructionsCommand());
103+
Commands.add(new InteractCommand());
92104
Commands.add(new PlayersInfoCommand());
93105

94106
// HUD text presets
@@ -117,8 +129,4 @@ public String getPackage() {
117129
public GithubRepo getRepo() {
118130
return new GithubRepo("zgoly", "meteorist");
119131
}
120-
121-
public static Identifier identifier(String path) {
122-
return Identifier.of(MOD_ID, path);
123-
}
124132
}

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

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)