Skip to content

Commit 568638e

Browse files
committed
Updated to MC 26.1
1 parent c7f8484 commit 568638e

9 files changed

Lines changed: 60 additions & 71 deletions

File tree

build.gradle

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version "${loom_version}"
2+
id 'net.fabricmc.fabric-loom' version "${loom_version}"
33
id 'maven-publish'
44
id "com.modrinth.minotaur" version "2.+"
55
}
@@ -43,9 +43,8 @@ loom {
4343

4444
dependencies {
4545
minecraft "com.mojang:minecraft:${project.minecraft_version}"
46-
mappings loom.officialMojangMappings()
47-
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
48-
modImplementation "carpet:fabric-carpet:${project.carpet_minecraft_version}-${project.carpet_core_version}"
46+
implementation "net.fabricmc:fabric-loader:${project.loader_version}"
47+
implementation "carpet:fabric-carpet:${project.carpet_minecraft_version}+${project.carpet_core_version}"
4948

5049
def includeImplementation = { String dependencyNotation ->
5150
implementation(dependencyNotation) {
@@ -68,7 +67,7 @@ dependencies {
6867

6968
// soft dependencies
7069

71-
modCompileOnly 'maven.modrinth:scarpet-graphics:0.1.4'
70+
compileOnly 'maven.modrinth:scarpet-graphics:0.1.4'
7271
runtimeOnly 'maven.modrinth:scarpet-graphics:0.1.4'
7372
}
7473

@@ -82,14 +81,14 @@ processResources {
8281

8382
tasks.withType(JavaCompile).configureEach {
8483
it.options.encoding = "UTF-8"
85-
it.options.release = 21
84+
it.options.release = 25
8685
}
8786

8887
java {
8988
withSourcesJar()
9089

91-
sourceCompatibility = JavaVersion.VERSION_21
92-
targetCompatibility = JavaVersion.VERSION_21
90+
sourceCompatibility = JavaVersion.VERSION_25
91+
targetCompatibility = JavaVersion.VERSION_25
9392
}
9493

9594
jar {
@@ -113,7 +112,7 @@ modrinth {
113112
projectId = "m00L1GVJ"
114113
versionNumber = project.mod_version
115114
versionType = "release"
116-
uploadFile = remapJar
115+
uploadFile = jar
117116
loaders = ["fabric"]
118117
dependencies = [
119118
// carpet

changelog.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
* Added support for checkbox, checkbox group and radio group components
2-
* Updated modal examples with new components
1+
* Updated to MC 26.1

gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/develop/
6-
minecraft_version=1.21.11
7-
loader_version=0.18.1
8-
loom_version=1.14-SNAPSHOT
6+
minecraft_version=26.1
7+
loader_version=0.18.4
8+
loom_version=1.15-SNAPSHOT
99

1010
# check available versions on maven for the given minecraft version you are using
1111
# https://masa.dy.fi/maven/carpet/fabric-carpet/
12-
carpet_minecraft_version=1.21.11
13-
carpet_core_version=1.4.193+v251211
12+
carpet_minecraft_version=26.1-beta-9
13+
carpet_core_version=v260311
1414

1515
# Mod Properties
1616
mod_version=1.7.3

gradle/wrapper/gradle-wrapper.jar

5.08 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.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
{
22
"required": true,
33
"package": "net.replaceitem.discarpet.mixins",
4-
"compatibilityLevel": "JAVA_21",
4+
"compatibilityLevel": "JAVA_25",
55
"mixins": [
66
"CallbackListAccessor",
77
"CommandImplMixin",
88
"FileArgumentMixin",
99
"MinecraftServerMixin",
1010
"SimpleTypeConverterAccessor"
1111
],
12-
"client": [
13-
],
12+
"client": [],
1413
"injectors": {
1514
"defaultRequire": 1
16-
}
17-
}
15+
}
16+
}

src/main/resources/fabric.mod.json

Lines changed: 38 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,40 @@
11
{
2-
"schemaVersion": 1,
3-
"id": "discarpet",
4-
"version": "${version}",
5-
6-
"name": "Discarpet",
7-
"description": "Adds discord bot functionality to scarpet",
8-
"authors": [
9-
"replaceitem"
10-
],
11-
"contact": {
12-
"homepage": "https://replaceitem.github.io/carpet-discarpet/",
13-
"issues": "https://github.com/replaceitem/carpet-discarpet/issues",
14-
"sources": "https://github.com/replaceitem/carpet-discarpet"
15-
},
16-
17-
"license": "MIT",
18-
"icon": "assets/discarpet/icon.png",
19-
20-
"environment": "*",
21-
"entrypoints": {
22-
"main": [
23-
"net.replaceitem.discarpet.Discarpet"
24-
]
25-
},
26-
"mixins": [
27-
"discarpet.mixins.json"
28-
],
29-
30-
"depends": {
31-
"minecraft": ">=1.21.5",
32-
"fabricloader": ">=0.15.0",
33-
"carpet": ">=1.4.140",
34-
"java": ">=21"
35-
},
36-
"custom": {
37-
"modmenu": {
38-
"parent": "carpet",
39-
"links": {
40-
"modmenu.discord": "https://discord.gg/etTDQAVSgt"
41-
}
2+
"schemaVersion": 1,
3+
"id": "discarpet",
4+
"version": "${version}",
5+
"name": "Discarpet",
6+
"description": "Adds discord bot functionality to scarpet",
7+
"authors": [
8+
"replaceitem"
9+
],
10+
"contact": {
11+
"homepage": "https://replaceitem.github.io/carpet-discarpet/",
12+
"issues": "https://github.com/replaceitem/carpet-discarpet/issues",
13+
"sources": "https://github.com/replaceitem/carpet-discarpet"
14+
},
15+
"license": "MIT",
16+
"icon": "assets/discarpet/icon.png",
17+
"environment": "*",
18+
"entrypoints": {
19+
"main": [
20+
"net.replaceitem.discarpet.Discarpet"
21+
]
22+
},
23+
"mixins": [
24+
"discarpet.mixins.json"
25+
],
26+
"depends": {
27+
"minecraft": ">=26.1",
28+
"fabricloader": ">=0.18.4",
29+
"carpet": "*",
30+
"java": ">=25"
31+
},
32+
"custom": {
33+
"modmenu": {
34+
"parent": "carpet",
35+
"links": {
36+
"modmenu.discord": "https://discord.gg/etTDQAVSgt"
37+
}
38+
}
4239
}
43-
}
44-
}
40+
}

0 commit comments

Comments
 (0)