Skip to content

Commit 6ede164

Browse files
covers1624covers1624
committed
Port to 1.21.1
1 parent b0fc03c commit 6ede164

Some content is hidden

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

43 files changed

+396
-449
lines changed

‎build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ plugins {
44
id 'java'
55
id 'maven-publish'
66
id 'signing'
7-
id 'net.neoforged.gradle.userdev' version '7.0.97'
7+
id 'net.neoforged.gradle.userdev' version '7.0.165'
88
}
99

1010
java {
1111
toolchain {
12-
languageVersion = JavaLanguageVersion.of(17)
12+
languageVersion = JavaLanguageVersion.of(21)
1313
}
1414
withSourcesJar()
1515
withJavadocJar()
@@ -40,7 +40,7 @@ runs {
4040
}
4141
data {
4242
workingDirectory file('run')
43-
programArguments.addAll '--mod', 'enderstorage', '--all', '--output', file("src/main/generated"), '--existing', file("src/main/resources")
43+
arguments.addAll '--mod', 'enderstorage', '--all', '--output', file("src/main/generated").absolutePath, '--existing', file("src/main/resources").absolutePath
4444
}
4545
}
4646

@@ -65,7 +65,7 @@ processResources {
6565
inputs.property 'mc_version', mc_version
6666
inputs.property 'ccl_version', ccl_version
6767

68-
filesMatching('META-INF/mods.toml') {
68+
filesMatching('META-INF/neoforge.mods.toml') {
6969
expand 'file': ['jarVersion': mod_version],
7070
'mc_version': mc_version,
7171
'forge_version': forge_version,

‎gradle.properties‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
mc_version=1.20.4
2-
forge_version=20.4.237
3-
ccl_version=4.5.0.+
1+
mc_version=1.21.1
2+
forge_version=21.1.72
3+
ccl_version=4.6.0.+
44
ccl_version_max=5.0.0
5-
jei_version=17.3.0.56
6-
mod_version=2.12.0
5+
jei_version=19.21.0.246
6+
mod_version=2.13.0

‎gradle/wrapper/gradle-wrapper.jar‎

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

‎gradlew‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

‎gradlew.bat‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

‎src/main/generated/.cache/282910bf22b00ad347f56cc1dfb6815b78e846d9‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.4 2024-09-16T20:52:41.811682802 EnderStorage Item models
1+
// 1.21.1 2024-10-29T17:38:05.796472454 EnderStorage Item models
22
acba8f17e2d7962b4f284bd0141fb59b507bce0a assets/enderstorage/models/item/ender_chest.json
33
e56e5f4371f82507db4f3edcd5514ff7a7c9b91c assets/enderstorage/models/item/ender_pouch.json
44
d85340997885467c20e49061f74a4858f9a276fd assets/enderstorage/models/item/ender_pouch_button_left_black.json

src/main/generated/.cache/3cae2902f4522543fae07a36318d5ed427f71d39 renamed to src/main/generated/.cache/4dc38c3db68a3f5d2829c70f6393f40139139856

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.4 2024-09-16T20:52:41.812348468 EnderStorage BlockStates
1+
// 1.21.1 2024-10-29T17:38:05.797054219 Block States: enderstorage
22
31ae921e4029b7a18bfc63f7cee5e5bf4ce92828 assets/enderstorage/blockstates/ender_chest.json
33
31ae921e4029b7a18bfc63f7cee5e5bf4ce92828 assets/enderstorage/blockstates/ender_tank.json
44
f105c225def5c2a406cab5c02f6b08774a37e9de assets/enderstorage/models/block/dummy.json

‎src/main/generated/.cache/53c252d47159caa2725cf9322152d4faa8adddc2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.20.4 2024-09-16T20:52:41.812208657 Tags for minecraft:block mod id enderstorage
2-
5b2130f55986594660c630dadb50eede58d67c12 data/minecraft/tags/blocks/mineable/pickaxe.json
1+
// 1.21.1 2024-10-29T17:38:05.796936778 Tags for minecraft:block mod id enderstorage
2+
5b2130f55986594660c630dadb50eede58d67c12 data/minecraft/tags/block/mineable/pickaxe.json

‎src/main/generated/.cache/abeef144278732cea2d82cd73e81bf44656e216c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
// 1.20.4 2024-09-16T21:38:39.399986928 enderstorage Recipes.
2-
bb677b191a99a75380a17e81af455e5153bfbe28 data/enderstorage/recipes/ender_chest.json
3-
8dd4905b942a5c607a7ea9807cb913f3b42b7217 data/enderstorage/recipes/ender_pouch.json
4-
aca0948f75762279ebd1818d1c364079d803e5d4 data/enderstorage/recipes/ender_tank.json
5-
30653b42566c435d1c10d426adb0674e8c39ede5 data/enderstorage/recipes/recolour_ender_chest.json
6-
82ae1581edd78b0b956e9d77dd4a481eb247b100 data/enderstorage/recipes/recolour_ender_pouch.json
7-
715fd7363f53f1a22671b58f1921af94ed5a015a data/enderstorage/recipes/recolour_ender_tank.json
1+
// 1.21.1 2024-10-29T17:38:05.795940909 enderstorage Recipes.
2+
691084b31f379bca3ee5012d2e1ed60fd81a21dd data/enderstorage/recipe/ender_chest.json
3+
13dfd4bf2b32ea1765585784ed682be1f51df748 data/enderstorage/recipe/ender_pouch.json
4+
a1754f0a9dc4bbf739c0e028ccac04918adf5011 data/enderstorage/recipe/ender_tank.json
5+
87e69e3098b99f159f035d53c75fcefe47f06e21 data/enderstorage/recipe/recolour_ender_chest.json
6+
0cca6be6a44775be872a3b7f21475256d6b853fb data/enderstorage/recipe/recolour_ender_pouch.json
7+
d731673c810f7ad214dd149dc3cbb3b6f4873071 data/enderstorage/recipe/recolour_ender_tank.json

0 commit comments

Comments
 (0)