Improved 26.2 Update

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 -- 26.1.2-brightgreen" alt="Minecraft version"/></a>
+	<a href="https://www.minecraft.net/"><img src="https://img.shields.io/badge/minecraft%20version-1.20.4 -- 26.2-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>
@@ -30,7 +30,7 @@
 | **Spider+**            | **Spider for Anti-Cheats**                    | **Matrix, Vulcan**            |
 | **Jesus+**             | **Jesus for Anti-Cheats**                     | **Matrix, Vulcan**            |
 | **No Slow+**           | **No Slow for Anti-Cheats**                   | **Matrix, Vulcan, Grim, NCP** |
-| **Fast Climb+** 	      | **Fast Climb for Anti-Cheats**                | **Spartan**                   |
+| **Fast Climb+** 	       | **Fast Climb for Anti-Cheats**                | **Spartan**                   |
 | **Gui Move+**          | **Gui Move for Anti-Cheats**                  | **Matrix, NCP**               |
 | **Timer+**             | **Timer for Anti-Cheats**                     | **NCP, Intave, Vulcan**       |
 | **Safe mine**          | **Prevents player from lava**                 | **Matrix**                    |
@@ -46,10 +46,10 @@
 | **Teams**     | **Does not beat teammates on BedWars and other modes** |                      |
 
 ## Integrations
-| Module              					           | Description                                       |
+| Module              					                | Description                                       |
 |-------------------------------------|---------------------------------------------------|
 | **Chest Tracker (Unofficial Port)** | **Colors support, background disabler, y offset** |
-| **Xaero's MiniMap** 					           | **Support baritone control on context**           |
+| **Xaero's MiniMap** 					                | **Support baritone control on context**           |
 
 ## Commands
 | Command        | Description                                       | Bypasses anti cheats                    |

build.gradle.kts

@@ -3,10 +3,13 @@ plugins {
 	id("maven-publish")
 }
 
+val archivesBaseName = providers.gradleProperty("archives_base_name").get()
+val mavenGroup = providers.gradleProperty("maven_group").get()
+
 base {
-    archivesName = properties["archives_name"] as String
+    archivesName = archivesBaseName
     version = libs.versions.mod.version.get()
-    group = properties["maven_group"] as String
+    group = mavenGroup
 }
 
 configurations.all {
@@ -52,12 +55,9 @@ dependencies {
 	annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.5.4")
 
 	// Meteor Client
+	implementation(libs.meteor.client)
 	//implementation(libs.baritone)
-	//implementation(libs.meteor.client)
-	implementation("meteordevelopment:orbit:0.2.4")
-	implementation(files("libs/meteor-client-26.2-local.jar"))
 	implementation(files("libs/baritone-api-fabric-1.11.1-17-g57758940.jar"))
-	implementation("org.meteordev:starscript:0.2.5")
 
 	// Xaero's Mods
 	compileOnly(libs.xlib) // XaeroLib
@@ -75,12 +75,24 @@ java {
 }
 
 fun toMinecraftCompat(version: String): String {
-	val match = Regex("""^(\d{2})\.([1-9]\d*)(?:\.([1-9]\d*))?$""")
-		.matchEntire(version)
-		?: error("Invalid Minecraft version format: $version. Expected YY.D or YY.D.H")
+	val stable = Regex("""^(\d{2})\.([1-9]\d*)(?:\.(\d+))?$""")
+
+	stable.matchEntire(version)?.let {
+		val (year, drop, _) = it.destructured
+		return "~$year.$drop"
+	}
+
+	val pre = Regex("""^(\d{2})\.([1-9]\d*)-pre[-.](\d+)$""")
+	pre.matchEntire(version)?.let {
+		return version.replace("-pre-", "-pre.")
+	}
+
+	val rc = Regex("""^(\d{2})\.([1-9]\d*)-rc[-.](\d+)$""")
+	rc.matchEntire(version)?.let {
+		return version.replace("-rc-", "-rc.")
+	}
 
-	val (year, drop, _) = match.destructured
-	return "~$year.$drop"
+	return version
 }
 
 loom {
@@ -101,9 +113,10 @@ tasks {
         }
 	}
     jar {
-        val licenseSuffix = project.base.archivesName.get()
-        from("LICENSE") {
-            rename { "${it}_${licenseSuffix}" }
+		inputs.property("archivesName", archivesBaseName)
+
+		from("LICENSE") {
+			rename { "${it}_$archivesBaseName" }
         }
     }
 }

gradle.properties

@@ -2,4 +2,4 @@ org.gradle.jvmargs=-Xmx4G
 
 # Mod Properties
 maven_group=nekiplay.meteorplus
-archives_name=meteor-plus
+archives_base_name=meteor-plus

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-mod-version = "26.1.2_1.0.9.5"
+mod-version = "26.2_1.0.9.5"
 
 # Fabric (https://fabricmc.net/develop)
 jdk = "25"
@@ -12,7 +12,7 @@ fabric-api = "0.156.0+26.2"
 loom = "1.17-SNAPSHOT"
 
 # Meteor (https://github.com/MeteorDevelopment/meteor-client)
-meteor = "26.1.2-SNAPSHOT"
+meteor = "26.2-SNAPSHOT"
 baritone = "26.1-SNAPSHOT"
 
 # Xaero's Mods
@@ -25,8 +25,6 @@ xmm = "26.4.2"
 
 # Where Is It (https://modrinth.com/mod/where-is-it-port/versions)
 whereisit = "2.7.5.2+26.2"
-# YetAnotherConfigLib (https://github.com/ponuing/WhereIsIt/blob/26.1/gradle.properties)
-yacl = "3.9.3+"
 
 [libraries]
 # Fabric base
@@ -41,14 +39,12 @@ meteor-client = { module = "meteordevelopment:meteor-client", version.ref = "met
 baritone = { module = "meteordevelopment:baritone", version.ref = "baritone" }
 
 # Xaero's Mods
-xlib = { module = "xaero.lib:xaerolib-fabric-26.1.2", version.ref = "xlib" }
-xwm = { module = "xaero.map:xaeroworldmap-fabric-26.1.2", version.ref = "xwm" }
-xmm = { module = "xaero.minimap:xaerominimap-fabric-26.1.2", version.ref = "xmm" }
+xlib = { module = "xaero.lib:xaerolib-fabric-26.2", version.ref = "xlib" }
+xwm = { module = "xaero.map:xaeroworldmap-fabric-26.2", version.ref = "xwm" }
+xmm = { module = "xaero.minimap:xaerominimap-fabric-26.2", version.ref = "xmm" }
 
 # Where Is It
 whereisit = { module = "maven.modrinth:where-is-it-port", version.ref = "whereisit" }
-# YetAnotherConfigLib
-yacl = { module = "maven.modrinth:yacl", version.ref = "yacl" }
 
 [plugins]
 fabric-loom = { id = "net.fabricmc.fabric-loom", version.ref = "loom" }

src/main/java/nekiplay/meteorplus/MeteorPlusAddon.java

@@ -221,7 +221,7 @@ public String getWebsite() {
 
 	@Override
 	public GithubRepo getRepo() {
-		return new GithubRepo("MeteorClientPlus", "MeteorPlus", "26.1.2", null);
+		return new GithubRepo("MeteorClientPlus", "MeteorPlus", "26.2", null);
 	}
 
 	@Override

src/main/java/nekiplay/meteorplus/features/modules/combat/criticals/CriticalsPlus.java

@@ -27,7 +27,7 @@ public static boolean skipCrit() {
 	public static boolean allowCrit() {
 		if (canCrit()) {
 			return true;
-		} else if (Modules.get().get(Criticals.class).isActive()) {
+		} else if (Modules.get().isActive(Criticals.class)) {
 			return !skipCrit();
 		}
 		return false;