Skip to content

Commit bddfd1c

Browse files
committed
Port to Fabric 26.1
1 parent 7e0f567 commit bddfd1c

File tree

926 files changed

+2891
-12509
lines changed

Some content is hidden

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

926 files changed

+2891
-12509
lines changed

build.gradle

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version '1.14-SNAPSHOT'
2+
id 'net.fabricmc.fabric-loom' version '1.15-SNAPSHOT'
33
id 'maven-publish'
44
id "me.shedaniel.unified-publishing" version "0.1.+"
55
}
@@ -64,37 +64,40 @@ fabricApi {
6464
dependencies {
6565
// To change the versions see the gradle.properties file
6666
minecraft "com.mojang:minecraft:${project.minecraft_version}"
67-
mappings loom.officialMojangMappings()
68-
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
67+
implementation "net.fabricmc:fabric-loader:${project.loader_version}"
6968

7069
// Fabric API. This is technically optional, but you probably want it anyway.
71-
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
70+
implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
7271

7372
// Uncomment the following line to enable the deprecated Fabric API modules.
7473
// These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
7574

7675
// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
7776

7877
// Team Reborn: Fabric energy
79-
include modApi('teamreborn:energy:4.2.0') {
78+
include api('teamreborn:energy:5.0.0') {
8079
exclude(group: "net.fabricmc.fabric-api")
8180
}
8281

8382
// REI integration
84-
modCompileOnlyApi "me.shedaniel.cloth:basic-math:0.6.1"
85-
modCompileOnlyApi "dev.architectury:architectury-fabric:19.0.1"
86-
modCompileOnlyApi "me.shedaniel:RoughlyEnoughItems-api-fabric:21.11.814"
87-
modCompileOnlyApi "me.shedaniel:RoughlyEnoughItems-default-plugin-fabric:21.11.814"
83+
//TODO re-enable
84+
//compileOnlyApi "me.shedaniel.cloth:basic-math:0.6.1"
85+
//compileOnlyApi "dev.architectury:architectury-fabric:19.0.1"
86+
//compileOnlyApi "me.shedaniel:RoughlyEnoughItems-api-fabric:21.11.814"
87+
//compileOnlyApi "me.shedaniel:RoughlyEnoughItems-default-plugin-fabric:21.11.814"
8888

8989
//JEI integration
90-
modCompileOnly "curse.maven:jei-238222:7364662"
90+
//TODO re-enable
91+
//compileOnly "curse.maven:jei-238222:7364662"
9192

9293
// EMI integration
93-
modCompileOnly "dev.emi:emi-fabric:1.1.8+1.21:api"
94+
//TODO re-enable
95+
//compileOnly "dev.emi:emi-fabric:1.1.8+1.21:api"
9496

9597
// CCTweaked integration
96-
modCompileOnlyApi "cc.tweaked:cc-tweaked-1.21-core-api:1.111.0"
97-
modCompileOnlyApi "cc.tweaked:cc-tweaked-1.21-fabric-api:1.111.0"
98+
//TODO re-enable
99+
//compileOnlyApi "cc.tweaked:cc-tweaked-1.21-core-api:1.111.0"
100+
//compileOnlyApi "cc.tweaked:cc-tweaked-1.21-fabric-api:1.111.0"
98101
}
99102

100103
processResources {
@@ -106,7 +109,7 @@ processResources {
106109
}
107110

108111
tasks.withType(JavaCompile).configureEach {
109-
it.options.release = 21
112+
it.options.release = 25
110113
}
111114

112115
java {
@@ -115,8 +118,8 @@ java {
115118
// If you remove this line, sources will not be generated.
116119
withSourcesJar()
117120

118-
sourceCompatibility = JavaVersion.VERSION_21
119-
targetCompatibility = JavaVersion.VERSION_21
121+
sourceCompatibility = JavaVersion.VERSION_25
122+
targetCompatibility = JavaVersion.VERSION_25
120123
}
121124

122125
jar {
@@ -125,6 +128,13 @@ jar {
125128
}
126129
}
127130

131+
//Show more errors for porting
132+
afterEvaluate {
133+
tasks.withType(JavaCompile) {
134+
options.compilerArgs << "-Xmaxerrs" << "2000"
135+
}
136+
}
137+
128138
// configure the maven publication
129139
publishing {
130140
publications {
@@ -146,7 +156,7 @@ publishing {
146156
tasks.register("distJar", Copy) {
147157
group = "build"
148158

149-
dependsOn(tasks.getByName("remapJar"))
159+
dependsOn(tasks.getByName("jar"))
150160

151161
var jarFile = project.rootDir.toPath().resolve("build/libs").resolve(project.archives_base_name + "-" + project.version + ".jar").toFile()
152162
from(jarFile)

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ org.gradle.debug=false
55

66
# Fabric Properties
77
# check these on https://fabricmc.net/develop
8-
minecraft_version=1.21.11
9-
loader_version=0.18.1
8+
minecraft_version=26.1
9+
loader_version=0.18.4
1010

1111
# Mod Properties
12-
mod_version=1.21.11-2.15.12-fabric
12+
mod_version=26.1-2.15.14-fabric
1313
maven_group=me.jddev0.energizedpower
1414
archives_base_name=energizedpower
1515
modid=energizedpower
1616

1717
# Dependencies
18-
fabric_version=0.139.4+1.21.11
18+
fabric_version=0.144.3+26.1
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
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

src/generated/resources/.cache/05cb91014ff9df84ab093379a4ba2eee76fe6829

Lines changed: 0 additions & 785 deletions
This file was deleted.

src/generated/resources/.cache/30cb00db1c2a2f188c206a001f53abd8ae32c39e

Lines changed: 0 additions & 116 deletions
This file was deleted.

0 commit comments

Comments
 (0)