26.1 Update

.github/workflows/dev_build.yml

@@ -8,8 +8,8 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-java@v5
         with:
-          java-version: 21
-          distribution: adopt
+          java-version: 25
+          distribution: temurin
       - name: Make gradlew executable
         run: chmod +x ./gradlew
 
@@ -26,8 +26,8 @@ jobs:
         uses: marvinpinto/action-automatic-releases@latest
         with:
           repo_token: '${{ secrets.GITHUB_TOKEN }}'
-          automatic_release_tag: "1.21.11_1.0.9.5"
+          automatic_release_tag: "26.1.2_1.0.9.5"
           prerelease: true
-          title: "1.21.11 | 1.0.9.5"
+          title: "26.1.2 | 1.0.9.5"
           files: |
             ./build/libs/*.jar

.github/workflows/pull_request.yml

@@ -8,8 +8,8 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-java@v5
         with:
-          java-version: 21
-          distribution: adopt
+          java-version: 25
+          distribution: temurin
       - name: Make gradlew executable
         run: chmod +x ./gradlew
       - name: Build

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.11-brightgreen" alt="Minecraft version"/></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://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                                       |
-|---------------------------------------|---------------------------------------------------|
-| **Chest Tracker (Unofficial Port)**   | **Colors support, background disabler, y offset** |
-| **Xaero's MiniMap** 					| **Support baritone control on context**           |
+| Module              					           | Description                                       |
+|-------------------------------------|---------------------------------------------------|
+| **Chest Tracker (Unofficial Port)** | **Colors support, background disabler, y offset** |
+| **Xaero's MiniMap** 					           | **Support baritone control on context**           |
 
 ## Commands
 | Command        | Description                                       | Bypasses anti cheats                    |
@@ -77,9 +77,9 @@
 
 # Installation Guide
 1. Install [Minecraft](https://www.minecraft.net)
-2. Install [Fabric](https://fabricmc.net) and [Fabric API](https://www.curseforge.com/minecraft/mc-mods/fabric-api) for your version of minecraft
-3. Download [Meteor Client](https://meteorclient.com) for your version of minecraft
-4. Download [Meteor Plus](https://github.com/MeteorClientPlus/MeteorPlus/releases) for your version of minecraft
+2. Install [Fabric](https://fabricmc.net) and [Fabric API](https://www.curseforge.com/minecraft/mc-mods/fabric-api) for your version of Minecraft
+3. Download [Meteor Client](https://meteorclient.com) for your version of Minecraft
+4. Download [Meteor Plus](https://github.com/MeteorClientPlus/MeteorPlus/releases) for your version of Minecraft
 5. Place the Meteor Client and Meteor Plus in your mods folder
 
     A: Make Commit we welcome anyone who makes a useful contribution to our free open source product

build.gradle.kts

@@ -15,37 +15,13 @@ configurations.all {
 }
 
 repositories {
-	maven {
-		url = uri("https://jm.gserv.me/repository/maven-public/")
-		content {
-			includeGroup("info.journeymap")
-		}
-	}
+	// Modrinth
 	maven {
 		url = uri("https://api.modrinth.com/maven/")
 		content {
 			includeGroup("maven.modrinth")
 		}
 	}
-	maven {
-        url = uri("https://www.cursemaven.com") 
-    }
-	maven { 
-        url = uri("https://masa.dy.fi/maven") 
-        }
-	// YACL
-	maven {
-		url = uri("https://maven.isxander.dev/releases")
-	}
-	// YACL Snapshots
-	maven {
-		name = "Xander Snapshot Maven"
-		url = uri("https://maven.isxander.dev/snapshots")
-	}
-	// Where Is It, JackFredLib
-	maven {
-		url = uri("https://maven.jackf.red/releases/")
-	}
 	// Meteor Client
 	maven {
         name = "meteor-maven"
@@ -55,35 +31,52 @@ repositories {
         name = "meteor-maven-snapshots"
         url = uri("https://maven.meteordev.org/snapshots")
     }
+	// XaeroLib
+	maven {
+		name = "Xaero's Maven"
+		url = uri("https://chocolateminecraft.com/maven")
+	}
 	mavenCentral()
 	gradlePluginPortal()
 }
 
 dependencies {
 	// Fabric
 	minecraft(libs.minecraft)
-	mappings(variantOf(libs.yarn) { classifier("v2") })
-	modImplementation(libs.fabric.loader)
+	implementation(libs.fabric.loader)
 
 	// Fabric API
-	modImplementation(libs.fabric.api)
+	implementation(libs.fabric.api)
 
 	// Mixin extras
 	annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.5.3")
 
 	// Meteor Client
-	modImplementation(files("libs\\baritone-unoptimized-fabric-1.15.0-2-gf7a53504.jar"))
-	modImplementation(libs.meteor.client)
-	implementation(libs.starscript)
-	implementation(libs.orbit)
+	implementation(libs.baritone)
+	implementation(libs.meteor.client)
 
 	// Xaero's Mods
-	modCompileOnly(libs.xwm) // Xaero's World Map
-	modCompileOnly(libs.xmm) // Xaero's Minimap
-	modCompileOnly(files("libs\\xaerolib-fabric-1.21.11-1.0.38.jar"))
+	compileOnly(libs.xlib) // XaeroLib
+	compileOnly(libs.xwm) // Xaero's World Map
+	compileOnly(libs.xmm) // Xaero's Minimap
 
 	// Chest Tracker
-	modImplementation(libs.whereisit)
+	implementation(libs.whereisit)
+}
+
+java {
+	toolchain {
+		languageVersion.set(JavaLanguageVersion.of(libs.versions.jdk.get().toInt()))
+	}
+}
+
+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 (year, drop, _) = match.destructured
+	return "~$year.$drop"
 }
 
 loom {
@@ -94,10 +87,11 @@ tasks {
     processResources {
         val propertyMap = mapOf(
             "version" to project.version,
-            "mc_version" to libs.versions.minecraft.get(),
+            "minecraft_version" to libs.versions.minecraft.get(),
+			"jdk_version" to libs.versions.jdk.get(),
             "gh_hash" to (System.getenv("GITHUB_SHA") ?: ""),
         )
-        
+
 	    filesMatching("fabric.mod.json") {
 		    expand (propertyMap)
         }
@@ -108,12 +102,4 @@ tasks {
             rename { "${it}_${licenseSuffix}" }
         }
     }
-    java {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
-    }
-    withType<JavaCompile> {
-        options.encoding = "UTF-8"
-        options.release = 21
-    }
-}
+}

donations.md

@@ -1,6 +1,6 @@
 ## Donation addresses
-| Cryptocurrency     | Addresses                                                             |
-|--------------------|-----------------------------------------------------------------------|
-| **Bitcoin (BTC)**  | **bc1qyg8u8r7z9235h7y9982kuz85wp582xdmkhm0hc**                        |
-| **Ethereum (EHT)** | **0x70B44EEdf0614d9fAaa2BC74f342E056919cEA2E**                        |
-| **Monero (XMR)**     | **49UpmgkdVKfF8deRceETiShuvW8BLGA59RkTRKbiwnxD4RAPUFebaztFQH9AbQuFxi5NjKoAbFcXpVRUosnXhTJ3PXrKAqv** |
+| Cryptocurrency     | Addresses                                                                                           |
+|--------------------|-----------------------------------------------------------------------------------------------------|
+| **Bitcoin (BTC)**  | **bc1qyg8u8r7z9235h7y9982kuz85wp582xdmkhm0hc**                                                      |
+| **Ethereum (EHT)** | **0x70B44EEdf0614d9fAaa2BC74f342E056919cEA2E**                                                      |
+| **Monero (XMR)**   | **49UpmgkdVKfF8deRceETiShuvW8BLGA59RkTRKbiwnxD4RAPUFebaztFQH9AbQuFxi5NjKoAbFcXpVRUosnXhTJ3PXrKAqv** |

gradle/libs.versions.toml

@@ -1,62 +1,54 @@
 [versions]
-mod-version = "1.21.11_1.0.9.5"
+mod-version = "26.1.2_1.0.9.5"
 
 # Fabric (https://fabricmc.net/develop)
-minecraft = "1.21.11"
-yarn-mappings = "1.21.11+build.3"
-fabric-loader = "0.18.4"
-fabric-api = "0.140.2+1.21.11"
+jdk = "25"
+minecraft = "26.1.2"
+fabric-loader = "0.19.2"
+fabric-api = "0.147.0+26.1.2"
 
 # Plugins
 # Loom (https://github.com/FabricMC/fabric-loom)
-loom = "1.14-SNAPSHOT"
+loom = "1.16-SNAPSHOT"
 
 # Meteor (https://github.com/MeteorDevelopment/meteor-client)
-meteor = "1.21.11-SNAPSHOT"
-# Starscript (https://github.com/MeteorDevelopment/starscript)
-starscript = "0.2.5"
-# Orbit (https://github.com/MeteorDevelopment/orbit)
-orbit = "0.2.4"
+meteor = "26.1.2-SNAPSHOT"
+baritone = "26.1-SNAPSHOT"
 
 # Xaero's Mods
+# XaeroLib
+xlib = "1.1.13"
 # Xaero's World Map (https://modrinth.com/mod/xaeros-world-map/versions)
-xwm = "1.40.2_Fabric_1.21.11"
+xwm = "1.40.14"
 # Xaero's Minimap (https://modrinth.com/mod/xaeros-minimap/versions)
-xmm = "25.3.2_Fabric_1.21.11"
+xmm = "25.3.11"
 
 # Where Is It (https://modrinth.com/mod/where-is-it-port/versions)
-whereisit = "2.7.3+"
-# YetAnotherConfigLib (https://github.com/ponuing/WhereIsIt/blob/1.21.11/gradle.properties)
-yacl = "3.8.1+1.21.11-fabric"
-
-# MaLiLib (https://www.curseforge.com/minecraft/mc-mods/malilib)
-malilib = "7130809"
+whereisit = "2.7.4+26.1"
+# YetAnotherConfigLib (https://github.com/ponuing/WhereIsIt/blob/26.1/gradle.properties)
+yacl = "3.9.0+26.1-fabric"
 
 [libraries]
 # Fabric base
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
-yarn = { module = "net.fabricmc:yarn", version.ref = "yarn-mappings" }
 fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-loader" }
 
 # Fabric API
 fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric-api" }
 
 # Meteor Client
 meteor-client = { module = "meteordevelopment:meteor-client", version.ref = "meteor" }
-starscript = { module = "org.meteordev:starscript", version.ref = "starscript" }
-orbit = { module = "meteordevelopment:orbit", version.ref = "orbit" }
+baritone = { module = "meteordevelopment:baritone", version.ref = "baritone" }
 
 # Xaero's Mods
-xwm = { module = "maven.modrinth:xaeros-world-map", version.ref = "xwm" }
-xmm = { module = "maven.modrinth:xaeros-minimap", version.ref = "xmm" }
+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" }
 
 # Where Is It
 whereisit = { module = "maven.modrinth:where-is-it-port", version.ref = "whereisit" }
 # YetAnotherConfigLib
-yacl = { module = "dev.isxander.yacl:yet-another-config-lib-fabric", version.ref = "yacl" }
-
-# MaLiLib
-malilib = { module = "curse.maven:malilib-303119", version.ref = "malilib" }
+yacl = { module = "maven.modrinth:yacl", version.ref = "yacl" }
 
 [plugins]
-fabric-loom = { id = "fabric-loom", version.ref = "loom" }
+fabric-loom = { id = "net.fabricmc.fabric-loom", version.ref = "loom" }

meteor-addon-list.json

@@ -16,7 +16,8 @@
     "1.21.8",
     "1.21.9",
 		"1.21.10",
-    "1.21.11"
+    "1.21.11",
+		"26.1.2"
   ],
   "icon": "https://github.com/MeteorClientPlus/MeteorPlus/blob/1.21.9/src/main/resources/assets/meteorplus/logo.png?raw=true",
   "discord": "https://discord.gg/N3gqYc7GRS",

settings.gradle.kts

@@ -9,4 +9,8 @@ pluginManagement {
 	}
 }
 
-rootProject.name = "meteor-plus"
+plugins {
+	id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+}
+
+rootProject.name = "meteor-plus"