Skip to content

Commit 4453ab2

Browse files
Edivad99Edivad99
committed
Port to 1.21.11
1 parent e7a5926 commit 4453ab2

Some content is hidden

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

44 files changed

+111
-179
lines changed

‎build.gradle‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ plugins {
88
id 'idea'
99
id 'net.neoforged.moddev' version "$mod_dev_gradle"
1010
id 'se.bjurr.gitchangelog.git-changelog-gradle-plugin' version '3.1.1'
11-
id 'me.modmuss50.mod-publish-plugin' version '1.0.0'
12-
id 'com.diffplug.spotless' version '6.25.0'
11+
id 'me.modmuss50.mod-publish-plugin' version '1.1.0'
12+
id 'com.diffplug.spotless' version '8.1.0'
1313
}
1414

1515
def isRelease = System.getenv('CURSEFORGE_TOKEN')
@@ -43,7 +43,10 @@ sourceSets.main.resources {
4343
}
4444

4545
neoForge {
46-
version = project.neo_version
46+
enable {
47+
version = project.neo_version
48+
disableRecompilation = System.getenv("CI") == "true"
49+
}
4750

4851
parchment {
4952
mappingsVersion = project.parchment_mappings_version
@@ -77,9 +80,9 @@ neoForge {
7780
clientData {
7881
clientData()
7982
gameDirectory = project.file('runs/data')
80-
programArguments.addAll '--mod', 'solargeneration',
81-
'--all', '--output', file('src/generated/resources/').getAbsolutePath(),
82-
'--existing', file('src/main/resources/').getAbsolutePath()
83+
programArguments.addAll '--mod', 'solargeneration', '--all',
84+
'--output', file ('src/generated/resources/').getAbsolutePath(),
85+
'--existing', file('src/main/resources/').getAbsolutePath()
8386
}
8487
}
8588

@@ -123,7 +126,7 @@ spotless {
123126
endWithNewline()
124127
trimTrailingWhitespace()
125128
removeUnusedImports()
126-
indentWithSpaces(2)
129+
leadingTabsToSpaces(2)
127130
}
128131
}
129132

@@ -143,14 +146,10 @@ tasks.register('generatePackageInfos') {
143146
pkgName = pkgName.replaceAll('/', '.')
144147

145148
def pkgInfoText = """
146-
|@FieldsAreNonnullByDefault
147-
|@MethodsReturnNonnullByDefault
148-
|@ParametersAreNonnullByDefault
149+
|@NullMarked
149150
|package $pkgName;
150151
|
151-
|import javax.annotation.ParametersAreNonnullByDefault;
152-
|import net.minecraft.FieldsAreNonnullByDefault;
153-
|import net.minecraft.MethodsReturnNonnullByDefault;
152+
|import org.jspecify.annotations.NullMarked;
154153
""".stripMargin().trim()
155154

156155
packageInfoFile.text = pkgInfoText

‎gradle.properties‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ org.gradle.caching=true
77
org.gradle.configuration-cache=true
88

99
## Environment Properties
10-
minecraft_version=1.21.10
11-
minecraft_version_range=[1.21.10,1.22)
12-
neo_version=21.10.20-beta
13-
neo_version_range=[21.10.20-beta,)
10+
minecraft_version=1.21.11
11+
minecraft_version_range=[1.21.11,1.22)
12+
neo_version=21.11.3-beta
13+
neo_version_range=[21.11.3-beta,)
1414
loader_version_range=[4,)
15-
mod_dev_gradle=2.0.115
15+
mod_dev_gradle=2.0.124
1616

1717
## Parchment
1818
parchment_minecraft_version=1.21.10
1919
parchment_mappings_version=2025.10.12
2020

2121
## Mod Properties
2222
mod_version=7.4.0
23-
edivadlib_id=7108943
24-
edivadlib_version_range=[3.4.0,)
23+
edivadlib_id=7335710
24+
edivadlib_version_range=[3.5.0,)
2525

2626
# Dependencies
27-
jei_version=26.0.0.1
27+
jei_version=27.0.0.1

‎gradle/wrapper/gradle-wrapper.jar‎

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

‎gradlew‎

Lines changed: 1 addition & 4 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.

‎src/generated/resources/.cache/03e039b23903db23d7f51c87535d67032a8f6f75‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.10 2025-10-18T12:16:44.288881 SolarGenerationRecipeProvider
1+
// 1.21.11 2025-12-15T10:49:08.970597 SolarGenerationRecipeProvider
22
fb38eaaa9d622daa21debcb904756fdee98ce512 data/solargeneration/advancement/recipes/misc/lapis_lazuli_from_shard.json
33
dab815e12fcd22167551d7e1cea9a4986f522d22 data/solargeneration/advancement/recipes/misc/lapis_shard.json
44
5a66e81ebd0bd75742109e3fd28124cd151e77cc data/solargeneration/advancement/recipes/misc/photovoltaic_cell.json

‎src/generated/resources/.cache/0d376be1d25b7817a15cd0c0a0d18023f1154b35‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.10 2025-10-18T12:16:44.289796 Model Definitions - solargeneration
1+
// 1.21.11 2025-12-15T10:49:08.971453 Model Definitions - solargeneration
22
a433862a0059c81b1daef831a2b4adc3782fa6b0 assets/solargeneration/blockstates/solar_panel_advanced.json
33
df887b0bb12d5bfdf156ee379a37896db5a54a7d assets/solargeneration/blockstates/solar_panel_hardened.json
44
6a38a4ca2371479176159c879799b4e54a30b76b assets/solargeneration/blockstates/solar_panel_leadstone.json

‎src/generated/resources/.cache/33ac199b1b4081e0881e6a61364c3892091c021c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
// 1.21.10 2025-10-18T12:16:44.287427 Tags for minecraft:block mod id solargeneration
1+
// 1.21.11 2025-12-15T10:49:08.969684 Tags for minecraft:block mod id solargeneration
22
2dcef60eaa3e33869208df16d9dcc6f45402d239 data/minecraft/tags/block/mineable/pickaxe.json
33
2dcef60eaa3e33869208df16d9dcc6f45402d239 data/minecraft/tags/block/needs_iron_tool.json

‎src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// 1.21.10 2025-10-18T12:16:44.288516 Loot Tables
2-
667ea9f6207fc01f8694b542564172bb7c6ea2c5 data/solargeneration/loot_table/blocks/solar_panel_advanced.json
3-
1f4ef78be0ca4dc39e75fc842cc6bb21683e3c7c data/solargeneration/loot_table/blocks/solar_panel_hardened.json
4-
c8ab38d73baf4500f32007dd9509975c00f335dd data/solargeneration/loot_table/blocks/solar_panel_leadstone.json
5-
2f3afc3cb2d6cb0dd00890fca926d5820b7d455e data/solargeneration/loot_table/blocks/solar_panel_redstone.json
6-
a723d8ceb099f0fbcf7038dcf2b0ccdbad6a95c4 data/solargeneration/loot_table/blocks/solar_panel_resonant.json
7-
bb50d0076f4861d29de59fba70954a6f4c27ba6d data/solargeneration/loot_table/blocks/solar_panel_signalum.json
8-
741115f424f573106f384dc9f82c50014815b06c data/solargeneration/loot_table/blocks/solar_panel_ultimate.json
1+
// 1.21.11 2025-12-15T10:50:28.051104 Loot Tables
2+
6f85f23fe22d4fbcd85df29589f596db6ff0ff01 data/solargeneration/loot_table/blocks/solar_panel_advanced.json
3+
e3aa910691506d7278eb84987f2a0fdc9bc7345b data/solargeneration/loot_table/blocks/solar_panel_hardened.json
4+
d4d4a600bbe3cb188c27ecea5eee6e1464688820 data/solargeneration/loot_table/blocks/solar_panel_leadstone.json
5+
ee5c9f3bed35c53f98cab88db15d230095d64b8d data/solargeneration/loot_table/blocks/solar_panel_redstone.json
6+
d8f04eb4aa0997e5550c0328f712c80b93058d06 data/solargeneration/loot_table/blocks/solar_panel_resonant.json
7+
f2ac479a4ab58cb37ef065526ad255c452189a37 data/solargeneration/loot_table/blocks/solar_panel_signalum.json
8+
ebbb72872b5fa152ef829e5bbee7527a1f1c0379 data/solargeneration/loot_table/blocks/solar_panel_ultimate.json

0 commit comments

Comments
 (0)