Skip to content

Commit 554686d

Browse files
committed
Port to NeoForge 26.1
1 parent 16187b6 commit 554686d

File tree

861 files changed

+3578
-6977
lines changed

Some content is hidden

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

861 files changed

+3578
-6977
lines changed

build.gradle

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id 'eclipse'
44
id 'idea'
55
id 'maven-publish'
6-
id 'net.neoforged.gradle.userdev' version '7.0.181'
6+
id 'net.neoforged.gradle.userdev' version '7.1.21'
77
id "me.shedaniel.unified-publishing" version "0.1.+"
88
}
99

@@ -36,7 +36,7 @@ base {
3636
archivesName = mod_id
3737
}
3838

39-
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
39+
java.toolchain.languageVersion = JavaLanguageVersion.of(25)
4040

4141
minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
4242

@@ -149,24 +149,27 @@ dependencies {
149149
implementation "net.neoforged:neoforge:${neo_version}"
150150

151151
// REI integration
152-
compileOnly 'me.shedaniel.cloth:basic-math:0.6.1'
153-
compileOnly "dev.architectury:architectury-neoforge:19.0.1"
154-
compileOnly 'me.shedaniel:RoughlyEnoughItems-neoforge:21.11.814'
152+
//TODO re-enable
153+
//compileOnly 'me.shedaniel.cloth:basic-math:0.6.1'
154+
//compileOnly "dev.architectury:architectury-neoforge:19.0.1"
155+
//compileOnly 'me.shedaniel:RoughlyEnoughItems-neoforge:21.11.814'
155156
compileOnly "me.shedaniel:REIPluginCompatibilities-forge-annotations:12.+"
156157

157158
// JEI integration
158-
compileOnly "mezz.jei:jei-1.21.11-common-api:27.3.0.10"
159-
compileOnly "mezz.jei:jei-1.21.11-neoforge-api:27.3.0.10"
159+
compileOnly "mezz.jei:jei-26.1-common-api:29.2.0.20"
160+
compileOnly "mezz.jei:jei-26.1-neoforge-api:29.2.0.20"
160161

161162
// EMI integration
162-
compileOnly "dev.emi:emi-neoforge:1.1.15+1.21.1:api"
163+
//TODO re-enable
164+
//compileOnly "dev.emi:emi-neoforge:1.1.15+1.21.1:api"
163165

164166
// Curios Continuation integration
165-
compileOnly "top.theillusivec4.curios:curios-neoforge:14.0.0+1.21.11"
167+
compileOnly "top.theillusivec4.curios:curios-neoforge:15.0.0-beta.1+26.1"
166168

167169
// CCTweaked integration
168-
compileOnly "cc.tweaked:cc-tweaked-1.21.8-core-api:1.116.1"
169-
compileOnly "cc.tweaked:cc-tweaked-1.21.8-forge-api:1.116.1"
170+
//TODO re-enable
171+
//compileOnly "cc.tweaked:cc-tweaked-1.21.8-core-api:1.116.1"
172+
//compileOnly "cc.tweaked:cc-tweaked-1.21.8-forge-api:1.116.1"
170173

171174
// For more info...
172175
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
@@ -207,6 +210,13 @@ jar {
207210
}
208211
}
209212

213+
//Show more errors for porting
214+
afterEvaluate {
215+
tasks.withType(JavaCompile) {
216+
options.compilerArgs << "-Xmaxerrs" << "2000"
217+
}
218+
}
219+
210220
publishing {
211221
publications {
212222
mavenJava(MavenPublication) {
@@ -233,7 +243,7 @@ unifiedPublishing {
233243
displayName = "Energized Power - " + project.minecraft_version + " - v" + project.mod_version.split("-")[1] + " [NeoForge]"
234244
version = project.mod_version
235245
changelog = new File("CHANGELOG.md").exists()?new File("CHANGELOG.md").getText("UTF-8"):""
236-
releaseType = "release"
246+
releaseType = "beta" //TODO change to "release" if NeoForge is no longer in beta
237247
gameVersions = [project.minecraft_version]
238248
gameLoaders = ["neoforge"]
239249

@@ -259,7 +269,7 @@ unifiedPublishing {
259269
}
260270
}
261271

262-
// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior.
272+
// IDEA no longer automatically downloads sources/javafdoc jars for dependencies, so we need to explicitly enable the behavior.
263273
idea {
264274
module {
265275
downloadSources = true

gradle.properties

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,17 @@ org.gradle.jvmargs=-Xmx4G
44
org.gradle.daemon=false
55
org.gradle.debug=false
66

7-
minecraft_version=1.21.11
8-
minecraft_version_range=[1.21.11,1.22)
7+
minecraft_version=26.1
8+
minecraft_version_range=[26.1,26.2)
99

10-
neo_version=21.11.38-beta
11-
neo_version_range=[21.11,)
10+
neo_version=26.1.0.17-beta
11+
neo_version_range=[26.1,)
1212
loader_version_range=[1,)
1313

14-
mapping_channel=official
15-
mapping_version=1.21.11
16-
1714
mod_id=energizedpower
1815
mod_name=Energized Power
1916
mod_license=MIT
20-
mod_version=1.21.11-2.15.14-neoforge
17+
mod_version=26.1-2.15.14-neoforge
2118
mod_group_id=me.jddev0.energizedpower
2219
mod_authors=JDDev0
2320
mod_description=This is a technology mod with many machines.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,38 @@
1-
// 1.21.11 2025-12-22T20:53:12.940672048 Registries
1+
// 26.1 2026-03-31T00:00:15.437782504 Registries
22
ce4e9b1d8ecb10afaa37089c10db4f812bc13bb6 data/energizedpower/neoforge/biome_modifier/add_tin_ore.json
33
74c397de30bc0f8c1484a85450c0b2099ec60072 data/energizedpower/painting_variant/factory.json
44
40ec13debc1998414c281ce78ac0bd6ea9245328 data/energizedpower/painting_variant/gear.json
5+
94b7127c035a33c2d1a177ec7c60f8159372f056 data/energizedpower/trade_set/electrician/level_1.json
6+
54e3fa18ffdf2fe59629eaf8bd284d6744d30105 data/energizedpower/trade_set/electrician/level_2.json
7+
8e40883923b40c8ec2643deff38520db22f9dc02 data/energizedpower/trade_set/electrician/level_3.json
8+
485d3f3982eeaf27496ed6776921adf8dedb766f data/energizedpower/trade_set/electrician/level_4.json
9+
9a54c203cc659653facfd469e160403890d1faf7 data/energizedpower/trade_set/electrician/level_5.json
10+
e249316c711dada894d862bb928839e40a69d729 data/energizedpower/villager_trade/electrician/1/cable_insulator.json
11+
6fd0feb9922c5d1cfdfa9d5b0bea685e2334dc14 data/energizedpower/villager_trade/electrician/1/copper_ingot_emerald.json
12+
a56b7481ac64555d1514f26d686dfd4d4e86c56b data/energizedpower/villager_trade/electrician/1/energized_power_book.json
13+
c655cb2fe511fb48044fac889b0ca1e2dc2bb864 data/energizedpower/villager_trade/electrician/1/iron_hammer.json
14+
c9743ac5ca5737123b3aeeb7810db3fd5b753a64 data/energizedpower/villager_trade/electrician/1/silicon_emerald.json
15+
646a4e7555ed141fca7cc61ae98dd5e58754e036 data/energizedpower/villager_trade/electrician/2/battery_2.json
16+
284ab98fa54ded2ff187793548274571578aacf3 data/energizedpower/villager_trade/electrician/2/copper_cable.json
17+
13d05125296170eddd4d92ccc6773ac760ebe0e5 data/energizedpower/villager_trade/electrician/2/copper_plate_emerald.json
18+
3ac0ec22d2b9250596be1882e0391a9ab72b8e7f data/energizedpower/villager_trade/electrician/2/cutter.json
19+
b96137c67fe9de4398a678cd92de1e4fc63b4942 data/energizedpower/villager_trade/electrician/2/energy_analyzer.json
20+
ee854a2f3d7f13ef0f47e51e5a94cbbb52d268be data/energizedpower/villager_trade/electrician/2/fluid_analyzer.json
21+
a7ab7b746d4f6a38584e15598a43c45f82773726 data/energizedpower/villager_trade/electrician/3/auto_crafter.json
22+
f5b744c7cd1da278397dfba0989ee4b746819cc2 data/energizedpower/villager_trade/electrician/3/basic_solar_cell_emerald.json
23+
8a3148dc5afe76366ff728c34789c1f5a056e3d1 data/energizedpower/villager_trade/electrician/3/charger.json
24+
083c44c9115e72cf9bd87fb7937aa5cc3f301fde data/energizedpower/villager_trade/electrician/3/coal_engine.json
25+
dc4d9c10b64f12515432abfae27a6d112c344a23 data/energizedpower/villager_trade/electrician/3/fluid_filler.json
26+
09702ee789b2ec40f13be3e0a2aca5382e0a2365 data/energizedpower/villager_trade/electrician/3/solar_panel_1.json
27+
e6020418066ed83e607efe3a8f9263f1d0b37457 data/energizedpower/villager_trade/electrician/4/battery_4.json
28+
173200aefa4266931d1bf9676c390abedab3bd74 data/energizedpower/villager_trade/electrician/4/compressor.json
29+
a2a1c0b14cda2c37303caccd3633b5b4e3f6b885 data/energizedpower/villager_trade/electrician/4/crusher.json
30+
b6c658bce40af1a98b0ba9d22d42a1870d167566 data/energizedpower/villager_trade/electrician/4/sawdust_emerald.json
31+
91d24ce3be4adb159c8cb262f8416b4291de03ee data/energizedpower/villager_trade/electrician/4/sawmill.json
32+
4a02b76a8dba1ed9daf3c9d51711391a128845c8 data/energizedpower/villager_trade/electrician/5/energized_copper_emerald.json
33+
595d0c1f7b42a36574ba10882fc1845f27398147 data/energizedpower/villager_trade/electrician/5/energizer.json
34+
3b893da9a88a112ef5567d23ff9fec99829409b0 data/energizedpower/villager_trade/electrician/5/lightning_generator.json
35+
edf62974aab3905df809d8bc70f5dd2983eb501d data/energizedpower/villager_trade/electrician/5/thermal_generator.json
536
aaa78c8c33a9aa7cd3386b065f9ab80bd1db1ad4 data/energizedpower/worldgen/configured_feature/tin_ore.json
637
316a8070a2e8dec6a6b08dfd04b23753c416ee12 data/energizedpower/worldgen/placed_feature/tin_ore.json
738
7ccd724e560b63f6b4858380f484c3c84b2dd1c0 data/energizedpower/worldgen/structure/factory_1.json

src/generated/resources/.cache/1223fa011db69c6a5684d9749625becd2b7dcf5e

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.11 2025-12-22T20:53:12.940519173 Tags for minecraft:block mod id energizedpower
1+
// 26.1 2026-03-31T00:00:15.43769313 Tags for minecraft:block mod id energizedpower
22
bb4186a3e465b9f0dc55195ffc40227269df8852 data/c/tags/block/ores.json
33
d56528e409960f498e933e25a7b732eabb64284b data/c/tags/block/ores/tin.json
44
3dd65c930d78a891766bed591b7962b592077cab data/c/tags/block/ores_in_ground/deepslate.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.21.11 2025-12-22T20:53:12.936735052 Tags for minecraft:painting_variant mod id energizedpower
1+
// 26.1 2026-03-31T00:00:15.435220249 Tags for minecraft:painting_variant mod id energizedpower
22
a8a6daa4902968eb7bd6579259038438741c926a data/minecraft/tags/painting_variant/placeable.json

src/generated/resources/.cache/3e1e5709d54dcd3ab9dbf2e011902ef0386bc75d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.11 2025-12-22T20:53:12.942739429 Tags for minecraft:item mod id energizedpower
1+
// 26.1 2026-03-31T00:00:15.439828588 Tags for minecraft:item mod id energizedpower
22
6af40b20a5859a5a3cdb0d6cbd6afe51ad578bcf data/ae2/tags/item/p2p_attunements/fe_p2p_tunnel.json
33
9c13ddcf3b08e2ca014a40c9b9dc39bd46405834 data/ae2/tags/item/p2p_attunements/fluid_p2p_tunnel.json
44
ffc429096520b17e4883f075eac0c840c0c62704 data/ae2/tags/item/p2p_attunements/item_p2p_tunnel.json
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// 26.1 2026-03-31T00:00:15.435344304 Tags for minecraft:villager_trade mod id energizedpower
2+
05fa32e4bf6039b3bdd69f870323b6dd816027f9 data/energizedpower/tags/villager_trade/electrician/level_1.json
3+
b17a60a81966cba14bb98330638298535c24a070 data/energizedpower/tags/villager_trade/electrician/level_2.json
4+
b068871cd1d311b96ca85f2fde842ea932cd0128 data/energizedpower/tags/villager_trade/electrician/level_3.json
5+
907a189de13ce8c9e6b62c2dda4192d556beebaa data/energizedpower/tags/villager_trade/electrician/level_4.json
6+
e45e639c9f846f149866bf777c15bcda9b0ef282 data/energizedpower/tags/villager_trade/electrician/level_5.json

src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.11 2025-12-22T20:53:12.940115409 Loot Tables
1+
// 26.1 2026-03-31T00:00:15.437396228 Loot Tables
22
d24af79b3c818677ed03734065b7990c9bc3f82d data/energizedpower/loot_table/blocks/advanced_auto_crafter.json
33
6602eac862b1f1ef2f9c6f75a0f0f9dabf7e6871 data/energizedpower/loot_table/blocks/advanced_battery_box.json
44
d38f5e962e7380883f3915f2c1a171a33c454779 data/energizedpower/loot_table/blocks/advanced_charger.json

src/generated/resources/.cache/7e6b3e9c9a4ca7cec7e4a330525bb8eed4b4d88a

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.11 2025-12-22T20:53:12.936885277 Model Definitions - energizedpower
1+
// 26.1 2026-03-31T00:00:15.435495181 Model Definitions - energizedpower
22
17d8a7f18babcbfd9d78be66322d8351cea4f8c8 assets/energizedpower/blockstates/advanced_auto_crafter.json
33
431bbedc3e5848b5d3478d29a91aedb2cf90ff2d assets/energizedpower/blockstates/advanced_battery_box.json
44
da3d4a1adaa4fdc26c79956846ca7699770326cd assets/energizedpower/blockstates/advanced_charger.json

0 commit comments

Comments
 (0)