Skip to content

Commit bdc0011

Browse files
Big-Iron-CheemsMineGame159
authored andcommitted
26.1 update
Compatible with patch versions too by default.
1 parent 6b0dbef commit bdc0011

13 files changed

Lines changed: 68 additions & 52 deletions

File tree

.github/workflows/dev_build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@ jobs:
77

88
steps:
99
- name: Checkout Repository
10-
uses: actions/checkout@v4
10+
uses: actions/checkout@v6
1111
with:
1212
persist-credentials: false
1313

1414
- name: Set up Gradle
15-
uses: gradle/actions/setup-gradle@v4
15+
uses: gradle/actions/setup-gradle@v6
1616

1717
- name: Set up Java
18-
uses: actions/setup-java@v4
18+
uses: actions/setup-java@v5
1919
with:
2020
distribution: 'temurin'
21-
java-version: 21
21+
java-version: 25
2222

2323
- name: Build with Gradle
2424
run: ./gradlew build
2525

2626
- name: Release
27-
uses: softprops/action-gh-release@v2
27+
uses: softprops/action-gh-release@v3
2828
with:
2929
token: ${{ secrets.GITHUB_TOKEN }}
3030
tag_name: snapshot

.github/workflows/pull_request.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@ jobs:
77

88
steps:
99
- name: Checkout Repository
10-
uses: actions/checkout@v4
10+
uses: actions/checkout@v6
1111
with:
12-
persist-credentials: false
12+
persist-credentials: false
1313

1414
- name: Set up Gradle
15-
uses: gradle/actions/setup-gradle@v4
15+
uses: gradle/actions/setup-gradle@v6
1616

1717
- name: Set up Java
18-
uses: actions/setup-java@v4
18+
uses: actions/setup-java@v5
1919
with:
2020
distribution: 'temurin'
21-
java-version: 21
21+
java-version: 25
2222

2323
- name: Build with Gradle
2424
run: ./gradlew build
2525

2626
- name: Release
27-
uses: actions/upload-artifact@v4
27+
uses: actions/upload-artifact@v7
2828
with:
2929
name: Artifacts
3030
path: build/libs/

build.gradle.kts

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,36 @@ repositories {
2222
dependencies {
2323
// Fabric
2424
minecraft(libs.minecraft)
25-
mappings(variantOf(libs.yarn) { classifier("v2") })
26-
modImplementation(libs.fabric.loader)
25+
implementation(libs.fabric.loader)
2726

2827
// Meteor
29-
modImplementation(libs.meteor.client)
28+
implementation(libs.meteor.client)
29+
}
30+
31+
java {
32+
toolchain {
33+
languageVersion.set(JavaLanguageVersion.of(libs.versions.jdk.get().toInt()))
34+
}
35+
}
36+
37+
fun toMinecraftCompat(version: String): String {
38+
val match = Regex("""^(\d{2})\.([1-9]\d*)(?:\.([1-9]\d*))?$""")
39+
.matchEntire(version)
40+
?: error("Invalid Minecraft version format: $version. Expected YY.D or YY.D.H")
41+
42+
val (year, drop, _) = match.destructured
43+
return "~$year.$drop"
3044
}
3145

3246
tasks {
3347
processResources {
3448
val propertyMap = mapOf(
3549
"version" to project.version,
36-
"mc_version" to libs.versions.minecraft.get()
50+
"minecraft_version" to toMinecraftCompat(libs.versions.minecraft.get()),
51+
"jdk_version" to libs.versions.jdk.get(),
3752
)
3853

3954
inputs.properties(propertyMap)
40-
41-
filteringCharset = "UTF-8"
42-
4355
filesMatching("fabric.mod.json") {
4456
expand(propertyMap)
4557
}
@@ -53,15 +65,12 @@ tasks {
5365
}
5466
}
5567

56-
java {
57-
sourceCompatibility = JavaVersion.VERSION_21
58-
targetCompatibility = JavaVersion.VERSION_21
59-
}
60-
61-
withType<JavaCompile> {
62-
options.encoding = "UTF-8"
63-
options.release = 21
64-
options.compilerArgs.add("-Xlint:deprecation")
65-
options.compilerArgs.add("-Xlint:unchecked")
68+
withType<JavaCompile>().configureEach {
69+
options.compilerArgs.addAll(
70+
listOf(
71+
"-Xlint:deprecation",
72+
"-Xlint:unchecked"
73+
)
74+
)
6675
}
6776
}

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
org.gradle.jvmargs=-Xmx2G
2+
org.gradle.parallel=true
3+
org.gradle.caching=true
24
org.gradle.configuration-cache=false
35

46
# Mod Properties

gradle/libs.versions.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
mod-version = "0.1.0"
33

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

910
# Loom (https://github.com/FabricMC/fabric-loom)
10-
loom = "1.14-SNAPSHOT"
11+
loom = "1.16-SNAPSHOT"
1112

1213
# Meteor (https://github.com/MeteorDevelopment/meteor-client/)
13-
meteor = "1.21.11-SNAPSHOT"
14+
meteor = "26.1.2-SNAPSHOT"
1415

1516
# Mods
1617

@@ -26,4 +27,4 @@ meteor-client = { module = "meteordevelopment:meteor-client", version.ref = "met
2627
# Mods
2728

2829
[plugins]
29-
fabric-loom = { id = "fabric-loom", version.ref = "loom" }
30+
fabric-loom = { id = "net.fabricmc.fabric-loom", version.ref = "loom" }

gradle/wrapper/gradle-wrapper.jar

3.25 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings.gradle.kts

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

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

src/main/java/com/example/addon/commands/CommandExample.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.mojang.brigadier.arguments.StringArgumentType;
44
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
55
import meteordevelopment.meteorclient.commands.Command;
6-
import net.minecraft.command.CommandSource;
6+
import net.minecraft.client.multiplayer.ClientSuggestionProvider;
77

88
/**
99
* The Meteor Client command API uses the <a href="https://github.com/Mojang/brigadier">same command system as Minecraft does</a>.
@@ -17,8 +17,8 @@ public CommandExample() {
1717
}
1818

1919
@Override
20-
public void build(LiteralArgumentBuilder<CommandSource> builder) {
21-
builder.executes(context -> {
20+
public void build(LiteralArgumentBuilder<ClientSuggestionProvider> builder) {
21+
builder.executes(_ -> {
2222
info("hi");
2323
return SINGLE_SUCCESS;
2424
});

0 commit comments

Comments
 (0)