Skip to content

Commit baeab71

Browse files
NekiplayNekiplay
committed
Descriptive message. This closes #92 
2 parents 7547617 + 946e8aa commit baeab71

200 files changed

Lines changed: 2925 additions & 3098 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/dev_build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ jobs:
88
- uses: actions/checkout@v6
99
- uses: actions/setup-java@v5
1010
with:
11-
java-version: 21
12-
distribution: adopt
11+
java-version: 25
12+
distribution: temurin
1313
- name: Make gradlew executable
1414
run: chmod +x ./gradlew
1515

@@ -26,8 +26,8 @@ jobs:
2626
uses: marvinpinto/action-automatic-releases@latest
2727
with:
2828
repo_token: '${{ secrets.GITHUB_TOKEN }}'
29-
automatic_release_tag: "1.21.11_1.0.9.5"
29+
automatic_release_tag: "26.1.2_1.0.9.5"
3030
prerelease: true
31-
title: "1.21.11 | 1.0.9.5"
31+
title: "26.1.2 | 1.0.9.5"
3232
files: |
3333
./build/libs/*.jar

‎.github/workflows/pull_request.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ jobs:
88
- uses: actions/checkout@v6
99
- uses: actions/setup-java@v5
1010
with:
11-
java-version: 21
12-
distribution: adopt
11+
java-version: 25
12+
distribution: temurin
1313
- name: Make gradlew executable
1414
run: chmod +x ./gradlew
1515
- name: Build

‎README.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<a href="https://www.minecraft.net/"><img src="https://img.shields.io/github/license/MeteorClientPlus/MeteorPlus?logo=mdBook&color=FF8C00" alt="Minecraft version"/></a>
1010
<br>
1111
<a href="https://www.meteoraddons.com/?addon=MeteorClientPlus%2FMeteorPlus"><img src="https://img.shields.io/badge/verified%20addon-yes-brightgreen" alt="Verified Addon"></a>
12-
<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>
12+
<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>
1313
<a href="https://github.com/Nekiplay/MeteorClientPlus/releases"><img src="https://img.shields.io/github/downloads/MeteorClientPlus/MeteorPlus/total" alt="Downloads"/></a>
1414
<a href="https://github.com/Nekiplay/MeteorClientPlus/stargazers"><img src="https://badgen.net/github/stars/MeteorClientPlus/MeteorPlus" alt="GitHub stars"/></a>
1515
<br>
@@ -30,7 +30,7 @@
3030
| **Spider+** | **Spider for Anti-Cheats** | **Matrix, Vulcan** |
3131
| **Jesus+** | **Jesus for Anti-Cheats** | **Matrix, Vulcan** |
3232
| **No Slow+** | **No Slow for Anti-Cheats** | **Matrix, Vulcan, Grim, NCP** |
33-
| **Fast Climb+** | **Fast Climb for Anti-Cheats** | **Spartan** |
33+
| **Fast Climb+** | **Fast Climb for Anti-Cheats** | **Spartan** |
3434
| **Gui Move+** | **Gui Move for Anti-Cheats** | **Matrix, NCP** |
3535
| **Timer+** | **Timer for Anti-Cheats** | **NCP, Intave, Vulcan** |
3636
| **Safe mine** | **Prevents player from lava** | **Matrix** |
@@ -46,10 +46,10 @@
4646
| **Teams** | **Does not beat teammates on BedWars and other modes** | |
4747

4848
## Integrations
49-
| Module | Description |
50-
|---------------------------------------|---------------------------------------------------|
51-
| **Chest Tracker (Unofficial Port)** | **Colors support, background disabler, y offset** |
52-
| **Xaero's MiniMap** | **Support baritone control on context** |
49+
| Module | Description |
50+
|-------------------------------------|---------------------------------------------------|
51+
| **Chest Tracker (Unofficial Port)** | **Colors support, background disabler, y offset** |
52+
| **Xaero's MiniMap** | **Support baritone control on context** |
5353

5454
## Commands
5555
| Command | Description | Bypasses anti cheats |
@@ -77,9 +77,9 @@
7777

7878
# Installation Guide
7979
1. Install [Minecraft](https://www.minecraft.net)
80-
2. Install [Fabric](https://fabricmc.net) and [Fabric API](https://www.curseforge.com/minecraft/mc-mods/fabric-api) for your version of minecraft
81-
3. Download [Meteor Client](https://meteorclient.com) for your version of minecraft
82-
4. Download [Meteor Plus](https://github.com/MeteorClientPlus/MeteorPlus/releases) for your version of minecraft
80+
2. Install [Fabric](https://fabricmc.net) and [Fabric API](https://www.curseforge.com/minecraft/mc-mods/fabric-api) for your version of Minecraft
81+
3. Download [Meteor Client](https://meteorclient.com) for your version of Minecraft
82+
4. Download [Meteor Plus](https://github.com/MeteorClientPlus/MeteorPlus/releases) for your version of Minecraft
8383
5. Place the Meteor Client and Meteor Plus in your mods folder
8484

8585
A: Make Commit we welcome anyone who makes a useful contribution to our free open source product

‎build.gradle.kts‎

Lines changed: 33 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -15,37 +15,13 @@ configurations.all {
1515
}
1616

1717
repositories {
18-
maven {
19-
url = uri("https://jm.gserv.me/repository/maven-public/")
20-
content {
21-
includeGroup("info.journeymap")
22-
}
23-
}
18+
// Modrinth
2419
maven {
2520
url = uri("https://api.modrinth.com/maven/")
2621
content {
2722
includeGroup("maven.modrinth")
2823
}
2924
}
30-
maven {
31-
url = uri("https://www.cursemaven.com")
32-
}
33-
maven {
34-
url = uri("https://masa.dy.fi/maven")
35-
}
36-
// YACL
37-
maven {
38-
url = uri("https://maven.isxander.dev/releases")
39-
}
40-
// YACL Snapshots
41-
maven {
42-
name = "Xander Snapshot Maven"
43-
url = uri("https://maven.isxander.dev/snapshots")
44-
}
45-
// Where Is It, JackFredLib
46-
maven {
47-
url = uri("https://maven.jackf.red/releases/")
48-
}
4925
// Meteor Client
5026
maven {
5127
name = "meteor-maven"
@@ -55,35 +31,52 @@ repositories {
5531
name = "meteor-maven-snapshots"
5632
url = uri("https://maven.meteordev.org/snapshots")
5733
}
34+
// XaeroLib
35+
maven {
36+
name = "Xaero's Maven"
37+
url = uri("https://chocolateminecraft.com/maven")
38+
}
5839
mavenCentral()
5940
gradlePluginPortal()
6041
}
6142

6243
dependencies {
6344
// Fabric
6445
minecraft(libs.minecraft)
65-
mappings(variantOf(libs.yarn) { classifier("v2") })
66-
modImplementation(libs.fabric.loader)
46+
implementation(libs.fabric.loader)
6747

6848
// Fabric API
69-
modImplementation(libs.fabric.api)
49+
implementation(libs.fabric.api)
7050

7151
// Mixin extras
7252
annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.5.3")
7353

7454
// Meteor Client
75-
modImplementation(files("libs\\baritone-unoptimized-fabric-1.15.0-2-gf7a53504.jar"))
76-
modImplementation(libs.meteor.client)
77-
implementation(libs.starscript)
78-
implementation(libs.orbit)
55+
implementation(libs.baritone)
56+
implementation(libs.meteor.client)
7957

8058
// Xaero's Mods
81-
modCompileOnly(libs.xwm) // Xaero's World Map
82-
modCompileOnly(libs.xmm) // Xaero's Minimap
83-
modCompileOnly(files("libs\\xaerolib-fabric-1.21.11-1.0.38.jar"))
59+
compileOnly(libs.xlib) // XaeroLib
60+
compileOnly(libs.xwm) // Xaero's World Map
61+
compileOnly(libs.xmm) // Xaero's Minimap
8462

8563
// Chest Tracker
86-
modImplementation(libs.whereisit)
64+
implementation(libs.whereisit)
65+
}
66+
67+
java {
68+
toolchain {
69+
languageVersion.set(JavaLanguageVersion.of(libs.versions.jdk.get().toInt()))
70+
}
71+
}
72+
73+
fun toMinecraftCompat(version: String): String {
74+
val match = Regex("""^(\d{2})\.([1-9]\d*)(?:\.([1-9]\d*))?$""")
75+
.matchEntire(version)
76+
?: error("Invalid Minecraft version format: $version. Expected YY.D or YY.D.H")
77+
78+
val (year, drop, _) = match.destructured
79+
return "~$year.$drop"
8780
}
8881

8982
loom {
@@ -94,10 +87,11 @@ tasks {
9487
processResources {
9588
val propertyMap = mapOf(
9689
"version" to project.version,
97-
"mc_version" to libs.versions.minecraft.get(),
90+
"minecraft_version" to libs.versions.minecraft.get(),
91+
"jdk_version" to libs.versions.jdk.get(),
9892
"gh_hash" to (System.getenv("GITHUB_SHA") ?: ""),
9993
)
100-
94+
10195
filesMatching("fabric.mod.json") {
10296
expand (propertyMap)
10397
}
@@ -108,12 +102,4 @@ tasks {
108102
rename { "${it}_${licenseSuffix}" }
109103
}
110104
}
111-
java {
112-
sourceCompatibility = JavaVersion.VERSION_21
113-
targetCompatibility = JavaVersion.VERSION_21
114-
}
115-
withType<JavaCompile> {
116-
options.encoding = "UTF-8"
117-
options.release = 21
118-
}
119-
}
105+
}

‎donations.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Donation addresses
2-
| Cryptocurrency | Addresses |
3-
|--------------------|-----------------------------------------------------------------------|
4-
| **Bitcoin (BTC)** | **bc1qyg8u8r7z9235h7y9982kuz85wp582xdmkhm0hc** |
5-
| **Ethereum (EHT)** | **0x70B44EEdf0614d9fAaa2BC74f342E056919cEA2E** |
6-
| **Monero (XMR)** | **49UpmgkdVKfF8deRceETiShuvW8BLGA59RkTRKbiwnxD4RAPUFebaztFQH9AbQuFxi5NjKoAbFcXpVRUosnXhTJ3PXrKAqv** |
2+
| Cryptocurrency | Addresses |
3+
|--------------------|-----------------------------------------------------------------------------------------------------|
4+
| **Bitcoin (BTC)** | **bc1qyg8u8r7z9235h7y9982kuz85wp582xdmkhm0hc** |
5+
| **Ethereum (EHT)** | **0x70B44EEdf0614d9fAaa2BC74f342E056919cEA2E** |
6+
| **Monero (XMR)** | **49UpmgkdVKfF8deRceETiShuvW8BLGA59RkTRKbiwnxD4RAPUFebaztFQH9AbQuFxi5NjKoAbFcXpVRUosnXhTJ3PXrKAqv** |

‎gradle/libs.versions.toml‎

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,54 @@
11
[versions]
2-
mod-version = "1.21.11_1.0.9.5"
2+
mod-version = "26.1.2_1.0.9.5"
33

44
# Fabric (https://fabricmc.net/develop)
5-
minecraft = "1.21.11"
6-
yarn-mappings = "1.21.11+build.3"
7-
fabric-loader = "0.18.4"
8-
fabric-api = "0.140.2+1.21.11"
5+
jdk = "25"
6+
minecraft = "26.1.2"
7+
fabric-loader = "0.19.2"
8+
fabric-api = "0.147.0+26.1.2"
99

1010
# Plugins
1111
# Loom (https://github.com/FabricMC/fabric-loom)
12-
loom = "1.14-SNAPSHOT"
12+
loom = "1.16-SNAPSHOT"
1313

1414
# Meteor (https://github.com/MeteorDevelopment/meteor-client)
15-
meteor = "1.21.11-SNAPSHOT"
16-
# Starscript (https://github.com/MeteorDevelopment/starscript)
17-
starscript = "0.2.5"
18-
# Orbit (https://github.com/MeteorDevelopment/orbit)
19-
orbit = "0.2.4"
15+
meteor = "26.1.2-SNAPSHOT"
16+
baritone = "26.1-SNAPSHOT"
2017

2118
# Xaero's Mods
19+
# XaeroLib
20+
xlib = "1.1.13"
2221
# Xaero's World Map (https://modrinth.com/mod/xaeros-world-map/versions)
23-
xwm = "1.40.2_Fabric_1.21.11"
22+
xwm = "1.40.14"
2423
# Xaero's Minimap (https://modrinth.com/mod/xaeros-minimap/versions)
25-
xmm = "25.3.2_Fabric_1.21.11"
24+
xmm = "25.3.11"
2625

2726
# Where Is It (https://modrinth.com/mod/where-is-it-port/versions)
28-
whereisit = "2.7.3+"
29-
# YetAnotherConfigLib (https://github.com/ponuing/WhereIsIt/blob/1.21.11/gradle.properties)
30-
yacl = "3.8.1+1.21.11-fabric"
31-
32-
# MaLiLib (https://www.curseforge.com/minecraft/mc-mods/malilib)
33-
malilib = "7130809"
27+
whereisit = "2.7.4+26.1"
28+
# YetAnotherConfigLib (https://github.com/ponuing/WhereIsIt/blob/26.1/gradle.properties)
29+
yacl = "3.9.0+26.1-fabric"
3430

3531
[libraries]
3632
# Fabric base
3733
minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
38-
yarn = { module = "net.fabricmc:yarn", version.ref = "yarn-mappings" }
3934
fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-loader" }
4035

4136
# Fabric API
4237
fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric-api" }
4338

4439
# Meteor Client
4540
meteor-client = { module = "meteordevelopment:meteor-client", version.ref = "meteor" }
46-
starscript = { module = "org.meteordev:starscript", version.ref = "starscript" }
47-
orbit = { module = "meteordevelopment:orbit", version.ref = "orbit" }
41+
baritone = { module = "meteordevelopment:baritone", version.ref = "baritone" }
4842

4943
# Xaero's Mods
50-
xwm = { module = "maven.modrinth:xaeros-world-map", version.ref = "xwm" }
51-
xmm = { module = "maven.modrinth:xaeros-minimap", version.ref = "xmm" }
44+
xlib = { module = "xaero.lib:xaerolib-fabric-26.1.2", version.ref = "xlib" }
45+
xwm = { module = "xaero.map:xaeroworldmap-fabric-26.1.2", version.ref = "xwm" }
46+
xmm = { module = "xaero.minimap:xaerominimap-fabric-26.1.2", version.ref = "xmm" }
5247

5348
# Where Is It
5449
whereisit = { module = "maven.modrinth:where-is-it-port", version.ref = "whereisit" }
5550
# YetAnotherConfigLib
56-
yacl = { module = "dev.isxander.yacl:yet-another-config-lib-fabric", version.ref = "yacl" }
57-
58-
# MaLiLib
59-
malilib = { module = "curse.maven:malilib-303119", version.ref = "malilib" }
51+
yacl = { module = "maven.modrinth:yacl", version.ref = "yacl" }
6052

6153
[plugins]
62-
fabric-loom = { id = "fabric-loom", version.ref = "loom" }
54+
fabric-loom = { id = "net.fabricmc.fabric-loom", version.ref = "loom" }

‎libs/baritone-unoptimized-fabric-1.15.0-2-gf7a53504.jar‎

-1.72 MB
Binary file not shown.

‎libs/xaerolib-fabric-1.21.11-1.0.38.jar‎

-555 KB
Binary file not shown.

‎meteor-addon-list.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"1.21.8",
1717
"1.21.9",
1818
"1.21.10",
19-
"1.21.11"
19+
"1.21.11",
20+
"26.1.2"
2021
],
2122
"icon": "https://github.com/MeteorClientPlus/MeteorPlus/blob/1.21.9/src/main/resources/assets/meteorplus/logo.png?raw=true",
2223
"discord": "https://discord.gg/N3gqYc7GRS",

‎settings.gradle.kts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@ pluginManagement {
99
}
1010
}
1111

12-
rootProject.name = "meteor-plus"
12+
plugins {
13+
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
14+
}
15+
16+
rootProject.name = "meteor-plus"

0 commit comments

Comments
 (0)