diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml index 048eacf..7f84c50 100644 --- a/.github/workflows/dev_build.yml +++ b/.github/workflows/dev_build.yml @@ -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 diff --git a/README.md b/README.md index 7774687..0e120e5 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Minecraft version
Verified Addon - Minecraft version + Minecraft version Downloads GitHub stars
diff --git a/build.gradle b/build.gradle index 0716237..6519e5c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "fabric-loom" version "1.11-SNAPSHOT" + id "fabric-loom" version "1.10-SNAPSHOT" id "maven-publish" } @@ -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 diff --git a/gradle.properties b/gradle.properties index ce72f17..e44aeff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1,12 @@ 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 @@ -17,9 +14,9 @@ archives_base_name=meteor-plus # 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3ae1e2f..0b55a3b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/libs/meteor-client-1.21.8-14.jar b/libs/meteor-client-1.21.6-2.jar similarity index 84% rename from libs/meteor-client-1.21.8-14.jar rename to libs/meteor-client-1.21.6-2.jar index ff1cd13..ce87a6f 100644 Binary files a/libs/meteor-client-1.21.8-14.jar and b/libs/meteor-client-1.21.6-2.jar differ diff --git a/src/main/java/nekiplay/meteorplus/features/modules/movement/fastladder/modes/Spartan.java b/src/main/java/nekiplay/meteorplus/features/modules/movement/fastladder/modes/Spartan.java index 4e321cf..761d6dc 100644 --- a/src/main/java/nekiplay/meteorplus/features/modules/movement/fastladder/modes/Spartan.java +++ b/src/main/java/nekiplay/meteorplus/features/modules/movement/fastladder/modes/Spartan.java @@ -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; diff --git a/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/Eclip.java b/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/Eclip.java index f75d159..53bdcd7 100644 --- a/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/Eclip.java +++ b/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/Eclip.java @@ -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() { diff --git a/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/MatrixNew.java b/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/MatrixNew.java index e4db85a..cd5d419 100644 --- a/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/MatrixNew.java +++ b/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/MatrixNew.java @@ -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) { @@ -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); } } } diff --git a/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/Verus.java b/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/Verus.java index 3c1fbce..5ad8c2b 100644 --- a/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/Verus.java +++ b/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/Verus.java @@ -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); diff --git a/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/Vulcan.java b/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/Vulcan.java index 30d7e5f..af99980 100644 --- a/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/Vulcan.java +++ b/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/Vulcan.java @@ -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); } } diff --git a/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/Vulcan277.java b/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/Vulcan277.java index eca6fdf..792e3fb 100644 --- a/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/Vulcan277.java +++ b/src/main/java/nekiplay/meteorplus/features/modules/movement/nofall/modes/Vulcan277.java @@ -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); diff --git a/src/main/java/nekiplay/meteorplus/features/modules/movement/spider/modes/Matrix.java b/src/main/java/nekiplay/meteorplus/features/modules/movement/spider/modes/Matrix.java index a4b23c8..984b0bc 100644 --- a/src/main/java/nekiplay/meteorplus/features/modules/movement/spider/modes/Matrix.java +++ b/src/main/java/nekiplay/meteorplus/features/modules/movement/spider/modes/Matrix.java @@ -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; diff --git a/src/main/java/nekiplay/meteorplus/features/modules/movement/spider/modes/Vulcan.java b/src/main/java/nekiplay/meteorplus/features/modules/movement/spider/modes/Vulcan.java index 3d32b6d..1a44283 100644 --- a/src/main/java/nekiplay/meteorplus/features/modules/movement/spider/modes/Vulcan.java +++ b/src/main/java/nekiplay/meteorplus/features/modules/movement/spider/modes/Vulcan.java @@ -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; diff --git a/src/main/java/nekiplay/meteorplus/mixin/meteorclient/modules/BreakIndicatorsMixin.java b/src/main/java/nekiplay/meteorplus/mixin/meteorclient/modules/BreakIndicatorsMixin.java index 2313199..f4fdf67 100644 --- a/src/main/java/nekiplay/meteorplus/mixin/meteorclient/modules/BreakIndicatorsMixin.java +++ b/src/main/java/nekiplay/meteorplus/mixin/meteorclient/modules/BreakIndicatorsMixin.java @@ -69,10 +69,10 @@ public BreakIndicatorsMixin(Category category, String name, String description, @EventHandler private void on2DRender(Render2DEvent event) { - Map blocks = ((WorldRendererAccessor) mc.worldRenderer).meteor$getBlockBreakingInfos(); + Map 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) { diff --git a/src/main/java/nekiplay/meteorplus/settings/ConfigModifier.java b/src/main/java/nekiplay/meteorplus/settings/ConfigModifier.java index 336edc2..eaee1a8 100644 --- a/src/main/java/nekiplay/meteorplus/settings/ConfigModifier.java +++ b/src/main/java/nekiplay/meteorplus/settings/ConfigModifier.java @@ -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())) @@ -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())) @@ -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()))