Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/dev_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ jobs:
uses: marvinpinto/action-automatic-releases@latest
with:
repo_token: '${{ secrets.GITHUB_TOKEN }}'
automatic_release_tag: "1.21.8_1.0.9.5"
automatic_release_tag: "1.21.6_1.0.9.5"
prerelease: true
title: "1.21.8 | 1.0.9.5"
title: "1.21.6 | 1.0.9.5"
files: |
./build/libs/*.jar
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<a href="https://www.minecraft.net/"><img src="https://img.shields.io/github/license/MeteorClientPlus/MeteorPlus?logo=mdBook&color=FF8C00" alt="Minecraft version"/></a>
<br>
<a href="https://anticope.pages.dev/addons/?addon=MeteorClientPlus%2FMeteorPlus"><img src="https://img.shields.io/badge/verified%20addon-yes-brightgreen" alt="Verified Addon"></a>
<a href="https://www.minecraft.net/"><img src="https://img.shields.io/badge/minecraft%20version-1.20.4 -- 1.21.8-brightgreen" alt="Minecraft version"/></a>
<a href="https://www.minecraft.net/"><img src="https://img.shields.io/badge/minecraft%20version-1.20.4 -- 1.21.5-brightgreen" alt="Minecraft version"/></a>
<a href="https://github.com/Nekiplay/MeteorClientPlus/releases"><img src="https://img.shields.io/github/downloads/MeteorClientPlus/MeteorPlus/total" alt="Downloads"/></a>
<a href="https://github.com/Nekiplay/MeteorClientPlus/stargazers"><img src="https://badgen.net/github/stars/MeteorClientPlus/MeteorPlus" alt="GitHub stars"/></a>
<br>
Expand Down
7 changes: 2 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "fabric-loom" version "1.11-SNAPSHOT"
id "fabric-loom" version "1.10-SNAPSHOT"
id "maven-publish"
}

Expand Down Expand Up @@ -52,15 +52,12 @@ dependencies {
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

// Fabric API
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

// Mixin extras
include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.4.1")))

// Meteor Client
modImplementation files("libs\\baritone-unoptimized-fabric-1.14.0-1.jar")
modImplementation files("libs\\meteor-client-1.21.8-14.jar")
modImplementation files("libs\\meteor-client-1.21.6-2.jar")

// Xaero's Mods
modCompileOnly "maven.modrinth:xaeros-world-map:${project.xwm_fabric_version}" // Xaero's World Map
Expand Down
13 changes: 5 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
org.gradle.jvmargs=-Xmx2G

# Fabric (https://fabricmc.net/versions.html)
minecraft_version=1.21.8
yarn_mappings=1.21.8+build.1
minecraft_version=1.21.6
yarn_mappings=1.21.6+build.1
loader_version=0.16.14

# Fabric API
fabric_version=0.130.0+1.21.8

# Mod Properties
mod_version=1.21.8_1.0.9.5
mod_version=1.21.5_1.0.9.5
maven_group=nekiplay.meteorplus
archives_base_name=meteor-plus

# Dependency Versions

# Xaero's Mods
# Xaero's World Map (https://modrinth.com/mod/xaeros-world-map/versions)
xwm_fabric_version=1.39.13_Fabric_1.21.8
xwm_fabric_version=1.39.10_Fabric_1.21.6
# Xaero's Minimap (https://modrinth.com/mod/xaeros-minimap/versions)
xmm_fabric_version=25.2.12_Fabric_1.21.8
xmm_fabric_version=25.2.7_Fabric_1.21.6

# Where Is It (https://modrinth.com/mod/where-is-it/versions)
where_is_it_version=2.6.4+1.21.2
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ private void work(Packet<?> packet) {
y = move.getY(y);

if (YGround(y, RGround(startY) - 0.1, RGround(startY) + 0.1)) {
((PlayerMoveC2SPacketAccessor) packet).meteor$setOnGround(true);
((PlayerMoveC2SPacketAccessor) packet).setOnGround(true);
}
if (mc.player.isOnGround() && block) {
block = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void onSendPacket(PacketEvent.Send event) {
if (!groundcheck) return;
if (!(event.packet instanceof PlayerMoveC2SPacket)
|| ((IPlayerMoveC2SPacket) event.packet).meteor$getTag() == 1337) return;
((PlayerMoveC2SPacketAccessor) event.packet).meteor$setOnGround(true);
((PlayerMoveC2SPacketAccessor) event.packet).setOnGround(true);
}

private void clip() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public void onSendPacket(PacketEvent.Send event) {
if (!mc.player.isOnGround()) {
if (mc.player.fallDistance > 2.69) {
timer.setOverride(0.3);
accessor.meteor$setOnGround(true);
accessor.setOnGround(true);
mc.player.fallDistance = 0;
}
if (mc.player.fallDistance > 3.5) {
Expand All @@ -51,7 +51,7 @@ public void onSendPacket(PacketEvent.Send event) {
}
if (!isEmpty) {
if (!((PlayerMoveC2SPacket) event.packet).isOnGround() && mc.player.getVelocity().y < -0.6) {
accessor.meteor$setOnGround(true);
accessor.setOnGround(true);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public void onSendPacket(PacketEvent.Send event) {
PlayerMoveC2SPacketAccessor accessor = (PlayerMoveC2SPacketAccessor)packet;

if (mc.player.fallDistance > 3.35) {
accessor.meteor$setOnGround(true);
accessor.setOnGround(true);
mc.player.fallDistance = 0f;
var vel = mc.player.getVelocity();
mc.player.setVelocity(vel.x, 0, vel.z);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ public void onSendPacket(PacketEvent.Send event) {
PlayerMoveC2SPacketAccessor accessor = (PlayerMoveC2SPacketAccessor) packet;


accessor.meteor$setOnGround(true);
accessor.setOnGround(true);
doSpoof = false;
accessor.meteor$setY((double) Math.round(mc.player.getPos().y * 2) / 2);
accessor.setY((double) Math.round(mc.player.getPos().y * 2) / 2);
mc.player.setPosition(mc.player.getPos().x, ((PlayerMoveC2SPacket) event.packet).getY(mc.player.getPos().y), mc.player.getPos().z);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public void onSendPacket(PacketEvent.Send event) {
PlayerMoveC2SPacketAccessor accessor = (PlayerMoveC2SPacketAccessor)packet;

if (mc.player.fallDistance > 7.0) {
accessor.meteor$setOnGround(true);
accessor.setOnGround(true);
mc.player.fallDistance = 0f;
var vel = mc.player.getVelocity();
mc.player.setVelocity(vel.x, 0, vel.z);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ private void work(Packet<?> packet) {
y = move.getY(y);

if (YGround(y, RGround(startY) - 0.1, RGround(startY) + 0.1)) {
((PlayerMoveC2SPacketAccessor) packet).meteor$setOnGround(true);
((PlayerMoveC2SPacketAccessor) packet).setOnGround(true);
}
if (mc.player.isOnGround() && block) {
block = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ private void work(Packet<?> packet) {
y = move.getY(y);

if (YGround(y, RGround(startY) - 0.1, RGround(startY) + 0.1)) {
((PlayerMoveC2SPacketAccessor) packet).meteor$setOnGround(true);
((PlayerMoveC2SPacketAccessor) packet).setOnGround(true);
}
if (mc.player.isOnGround() && block) {
block = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ public BreakIndicatorsMixin(Category category, String name, String description,
@EventHandler
private void on2DRender(Render2DEvent event) {

Map<Integer, BlockBreakingInfo> blocks = ((WorldRendererAccessor) mc.worldRenderer).meteor$getBlockBreakingInfos();
Map<Integer, BlockBreakingInfo> blocks = ((WorldRendererAccessor) mc.worldRenderer).getBlockBreakingInfos();

float ownBreakingStage = ((ClientPlayerInteractionManagerAccessor) mc.interactionManager).meteor$getBreakingProgress();
BlockPos ownBreakingPos = ((ClientPlayerInteractionManagerAccessor) mc.interactionManager).meteor$getCurrentBreakingBlockPos();
float ownBreakingStage = ((ClientPlayerInteractionManagerAccessor) mc.interactionManager).getBreakingProgress();
BlockPos ownBreakingPos = ((ClientPlayerInteractionManagerAccessor) mc.interactionManager).getCurrentBreakingBlockPos();


if (ownBreakingPos != null && ownBreakingStage > 0) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ private void changedProtection() {
.set("z", () -> Value.number(mc.player != null ? Utils.getPlayerSpeed().z : 0))
)

.set("breaking_progress", () -> Value.number(mc.interactionManager != null ? ((ClientPlayerInteractionManagerAccessor) mc.interactionManager).meteor$getBreakingProgress() : 0))
.set("breaking_progress", () -> Value.number(mc.interactionManager != null ? ((ClientPlayerInteractionManagerAccessor) mc.interactionManager).getBreakingProgress() : 0))
.set("biome", ConfigModifier::biome)

.set("dimension", () -> Value.string(PlayerUtils.getDimension().name()))
Expand Down Expand Up @@ -208,7 +208,7 @@ private void changedProtection() {
.set("z", () -> Value.number(0))
)

.set("breaking_progress", () -> Value.number(mc.interactionManager != null ? ((ClientPlayerInteractionManagerAccessor) mc.interactionManager).meteor$getBreakingProgress() : 0))
.set("breaking_progress", () -> Value.number(mc.interactionManager != null ? ((ClientPlayerInteractionManagerAccessor) mc.interactionManager).getBreakingProgress() : 0))
.set("biome", ConfigModifier::biome)

.set("dimension", () -> Value.string(PlayerUtils.getDimension().name()))
Expand Down Expand Up @@ -286,7 +286,7 @@ private void changedProtection() {
.set("z", () -> Value.number(mc.player != null ? Utils.getPlayerSpeed().z : 0))
)

.set("breaking_progress", () -> Value.number(mc.interactionManager != null ? ((ClientPlayerInteractionManagerAccessor) mc.interactionManager).meteor$getBreakingProgress() : 0))
.set("breaking_progress", () -> Value.number(mc.interactionManager != null ? ((ClientPlayerInteractionManagerAccessor) mc.interactionManager).getBreakingProgress() : 0))
.set("biome", ConfigModifier::biome)

.set("dimension", () -> Value.string(PlayerUtils.getDimension().name()))
Expand Down
Loading