1.21.10 Update

Author: Merennor

.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.9_1.0.9.5"
+          automatic_release_tag: "1.21.10_1.0.9.5"
           prerelease: true
-          title: "1.21.9 | 1.0.9.5"
+          title: "1.21.10 | 1.0.9.5"
           files: |
             ./build/libs/*.jar

README.md

@@ -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://www.meteoraddons.com/?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.9-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.10-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>

build.gradle

@@ -44,7 +44,16 @@ repositories {
 	// Where Is It, JackFredLib
 	maven {
 		url = uri("https://maven.jackf.red/releases/")
+	// Meteor Client
 	}
+	    maven {
+        name = "meteor-maven"
+        url = "https://maven.meteordev.org/releases"
+    } 
+	    maven {
+        name = "meteor-maven-snapshots"
+        url = "https://maven.meteordev.org/snapshots"
+    }
 	mavenCentral()
 	gradlePluginPortal()
 }
@@ -62,8 +71,10 @@ dependencies {
 	include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.5.0")))
 
 	// Meteor Client
-	modImplementation files("libs\\baritone-unoptimized-fabric-1.14.0-1.jar")
-	modImplementation files("libs\\meteor-client-1.21.9-local.jar")
+	modImplementation files("libs\\baritone-unoptimized-fabric-1.14.0-1.jar") 
+	modImplementation("meteordevelopment:meteor-client:${project.minecraft_version}-SNAPSHOT")
+	implementation "org.meteordev:starscript:0.2.5"
+	implementation "meteordevelopment:orbit:0.2.3"
 
 	// Xaero's Mods
 	modCompileOnly "maven.modrinth:xaeros-world-map:${project.xwm_fabric_version}" // Xaero's World Map
@@ -77,6 +88,12 @@ loom {
 	accessWidenerPath = file("src/main/resources/meteorplus.accesswidener")
 }
 
+jar {
+    from("LICENSE") {
+        rename { "${it}_${project.base.archivesName}" }
+    }
+}
+
 processResources {
 	filesMatching("fabric.mod.json") {
 		expand "version": project.mod_version, "mc_version": project.minecraft_version, "gh_hash": (System.getenv("GITHUB_SHA") ?: "")

gradle.properties

@@ -1,25 +1,25 @@
 org.gradle.jvmargs=-Xmx4G
 
 # Fabric (https://fabricmc.net/versions.html)
-minecraft_version=1.21.9
-yarn_mappings=1.21.9+build.1
+minecraft_version=1.21.10
+yarn_mappings=1.21.10+build.2
 loader_version=0.17.2
 
 # Fabric API
-fabric_version=0.133.14+1.21.9
+fabric_version=0.135.0+1.21.10
 
 # Mod Properties
-mod_version=1.21.9_1.0.9.5
+mod_version=1.21.10_1.0.9.5
 maven_group=nekiplay.meteorplus
-archives_base_name=meteor-plus
+archives_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.16_Fabric_1.21.9
+xwm_fabric_version=1.39.17_Fabric_1.21.9
 # Xaero's Minimap (https://modrinth.com/mod/xaeros-minimap/versions)
-xmm_fabric_version=25.2.14_Fabric_1.21.9
+xmm_fabric_version=25.2.15_Fabric_1.21.9
 
 # Where Is It (https://modrinth.com/mod/where-is-it/versions)
 where_is_it_version=2.6.4+1.21.2

libs/meteor-client-1.21.9-local.jar

@@ -7,7 +7,7 @@
 import meteordevelopment.meteorclient.MeteorClient;
 import meteordevelopment.meteorclient.events.game.GameLeftEvent;
 import meteordevelopment.meteorclient.events.meteor.KeyEvent;
-import meteordevelopment.meteorclient.events.meteor.MouseButtonEvent;
+import meteordevelopment.meteorclient.events.meteor.MouseClickEvent;
 import meteordevelopment.meteorclient.systems.modules.Categories;
 import meteordevelopment.meteorclient.systems.modules.render.blockesp.ESPBlock;
 import meteordevelopment.meteorclient.systems.modules.render.blockesp.ESPBlockData;
@@ -479,7 +479,7 @@ private void onKeyEvent(KeyEvent event)
 	}
 
 	@EventHandler
-	private void onMouseButtonEvent(MouseButtonEvent event) {
+	private void onMouseClickEvent(MouseClickEvent event) {
 		if (event.action == KeyAction.Press && isPressed()) {
 			pause_toggle = !pause_toggle;
 			if (pause_toggle) {

src/main/java/nekiplay/meteorplus/features/modules/world/XrayBruteforce.java

@@ -142,13 +142,13 @@ private void renderBlock(Render2DEvent event, BlockPos pos, double shrinkFactor,
 	@Unique
 	private void renderPacket(Render2DEvent event, List<PacketMine.MyBlock> blocks) {
 		for (PacketMine.MyBlock block : blocks) {
-			if (block.mining && block.progress != Double.POSITIVE_INFINITY) {
+			if (block.mining && block.progress() != Double.POSITIVE_INFINITY) {
 				VoxelShape shape = block.blockState.getOutlineShape(mc.world, block.blockPos);
 				if (shape == null || shape.isEmpty()) return;
 
 				Box orig = shape.getBoundingBox();
 
-				double progressNormalised = block.progress > 1 ? 1 : block.progress;
+				double progressNormalised = Math.min(1, block.progress());
 				double shrinkFactor = 1d - progressNormalised;
 				BlockPos pos = block.blockPos;
 

src/main/java/nekiplay/meteorplus/mixin/meteorclient/modules/BreakIndicatorsMixin.java

@@ -4,7 +4,7 @@
 import baritone.api.pathing.goals.GoalBlock;
 import meteordevelopment.meteorclient.events.Cancellable;
 import meteordevelopment.meteorclient.events.meteor.KeyEvent;
-import meteordevelopment.meteorclient.events.meteor.MouseButtonEvent;
+import meteordevelopment.meteorclient.events.meteor.MouseClickEvent;
 import meteordevelopment.meteorclient.events.world.TickEvent;
 import meteordevelopment.meteorclient.settings.BoolSetting;
 import meteordevelopment.meteorclient.settings.KeybindSetting;
@@ -256,7 +256,7 @@ private void onKeyEvent(KeyEvent event)
 	}
 	@Unique
 	@EventHandler
-	private void onMouseButtonEvent(MouseButtonEvent event) {
+	private void onMouseClickEvent(MouseClickEvent event) {
 		if (mc.world != null && event.action == KeyAction.Press) {
 			Work(event);
 		}

src/main/java/nekiplay/meteorplus/mixin/meteorclient/modules/FreecamMixin.java

@@ -1,7 +1,7 @@
 package nekiplay.meteorplus.mixin.meteorclient.modules;
 
 
-import meteordevelopment.meteorclient.events.meteor.MouseButtonEvent;
+import meteordevelopment.meteorclient.events.meteor.MouseClickEvent;
 import meteordevelopment.meteorclient.settings.BoolSetting;
 import meteordevelopment.meteorclient.settings.Setting;
 import meteordevelopment.meteorclient.settings.SettingGroup;
@@ -16,6 +16,8 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import net.minecraft.client.gui.Click;
+import net.minecraft.client.input.MouseInput;
 
 import static meteordevelopment.meteorclient.MeteorClient.mc;
 import static nekiplay.meteorplus.MeteorPlusAddon.HUD_TITLE;
@@ -40,10 +42,10 @@ public MiddleClickExtraMixin() {
 		.build()
 	);
 
-    @Inject(method = "onMouseButton", at = @At("HEAD"), cancellable = true)
-	private void onMouseButton(MouseButtonEvent event, CallbackInfo ci) {
-		if (event.action == KeyAction.Press && event.button == 2 && mc.currentScreen == null) {
-			if (event.action != KeyAction.Press || event.button != GLFW_MOUSE_BUTTON_MIDDLE) return;
+    @Inject(method = "onMouseClick", at = @At("HEAD"), cancellable = true)
+	private void onMouseClick(MouseClickEvent event, CallbackInfo ci) {
+		if (event.action == KeyAction.Press && event.button() == 2 && mc.currentScreen == null) {
+			if (event.action != KeyAction.Press || event.button() != 2) return;
 			if (noInventory.get() && mc.currentScreen != null) {
 				ci.cancel();
 			}