From f7ba2776c174522bcc49bfbbcc81bee48fc20d1b Mon Sep 17 00:00:00 2001 From: NewJumper Date: Thu, 9 Jan 2025 19:30:06 -0600 Subject: [PATCH] updated to 1.21.1 --- build.gradle | 7 ++++--- gradle.properties | 16 ++++++++-------- gradle/wrapper/gradle-wrapper.properties | 3 ++- gradlew | 5 ++++- gradlew.bat | 2 ++ settings.gradle | 2 +- .../103d9f3f36b01595f1aa5172191e60eff02e6924 | 2 +- .../16a987815a5a6d3b74a700570adf310b2e53ecae | 2 +- .../2b1c4c301b77a741c666834d476e7a049e70d3df | 2 +- .../2cdab8a05c139b60806a3879962e52a7f2933554 | 2 +- .../56da682b774a711e2ae6b1d3933cc0dfb33b99d9 | 2 +- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 2 +- .../5e6a331e51b12074ee68391963c1cb803c27d050 | 2 +- .../735031f3addf80804addae5e3f53249900116f1e | 2 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 2 +- .../b2a5cff36cd7898e89c581bb80c5da767a3f79d1 | 2 +- .../e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 | 2 +- 17 files changed, 32 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index d36b6865b..1b6f23120 100644 --- a/build.gradle +++ b/build.gradle @@ -3,8 +3,9 @@ plugins { id 'eclipse' id 'idea' id 'maven-publish' - id 'net.neoforged.gradle.userdev' version '7.0.171' + id 'net.neoforged.gradle.userdev' version '7.0.178' } + tasks.named('wrapper', Wrapper).configure { distributionType = Wrapper.DistributionType.BIN } version = "neoforge-${minecraft_version}-${mod_version}" @@ -26,7 +27,7 @@ runs { server { systemProperty 'forge.enabledGameTestNamespaces', project.mod_id - programArgument '--nogui' + argument '--nogui' } gameTestServer { @@ -34,7 +35,7 @@ runs { } data { - programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() + arguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() } } diff --git a/gradle.properties b/gradle.properties index d487b38a4..e9e5174b5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.daemon=false org.gradle.debug=false # Environment Properties -minecraft_version=1.21 -minecraft_version_range=[1.21,1.21.2) -neo_version=21.0.167 -neo_version_range=[21.0.143,) +minecraft_version=1.21.1 +minecraft_version_range=[1.21.1,1.21.2) +neo_version=21.1.93 +neo_version_range=[21.1.0,) loader_version_range=[4,) -neogradle.subsystems.parchment.minecraftVersion=1.21 -neogradle.subsystems.parchment.mappingsVersion=2024.11.10 -jei_version=19.8.2.99 -emi_version=1.1.12 +neogradle.subsystems.parchment.minecraftVersion=1.21.1 +neogradle.subsystems.parchment.mappingsVersion=2024.11.17 +jei_version=19.21.0.247 +emi_version=1.1.18 ## Mod Properties mod_id=deeperdarker diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4eaec4670..cea7a793a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index b740cf133..f5feea6d6 100644 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30dbd..9d21a2183 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/settings.gradle b/settings.gradle index ada876e2e..90ae98fa4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,5 +7,5 @@ pluginManagement { } plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0' } diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 index d7acf3a79..a1eed3c87 100644 --- a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 +++ b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -1,4 +1,4 @@ -// 1.21 2024-12-12T16:46:10.7707931 Registries +// 1.21.1 2025-01-09T19:24:08.7798676 Registries 65c8c67a4ec7ef0ce6846fb2f4d921cc6ceb02e2 data/deeperdarker/damage_type/bite.json 0b65c61bd1e5086d0f3685566cc6cecf6e324516 data/deeperdarker/damage_type/ring.json dede162345c14db637f3dd9a20ca9319e037ae9d data/deeperdarker/dimension/otherside.json diff --git a/src/generated/resources/.cache/16a987815a5a6d3b74a700570adf310b2e53ecae b/src/generated/resources/.cache/16a987815a5a6d3b74a700570adf310b2e53ecae index 1ce9d93ea..682ea8060 100644 --- a/src/generated/resources/.cache/16a987815a5a6d3b74a700570adf310b2e53ecae +++ b/src/generated/resources/.cache/16a987815a5a6d3b74a700570adf310b2e53ecae @@ -1,4 +1,4 @@ -// 1.21 2024-08-04T12:12:17.7746411 Block States: deeperdarker +// 1.21.1 2025-01-09T19:24:08.7886445 Block States: deeperdarker 4394f02c270408be611b2f3ba7abfbfd658cb0ff assets/deeperdarker/blockstates/ancient_vase.json 165980177c5adcf470b9a08fe401e3bb1a4966f0 assets/deeperdarker/blockstates/blooming_moss_block.json c90869597c5f9312912c741c7edfc5974762efd9 assets/deeperdarker/blockstates/blooming_sculk_stone.json diff --git a/src/generated/resources/.cache/2b1c4c301b77a741c666834d476e7a049e70d3df b/src/generated/resources/.cache/2b1c4c301b77a741c666834d476e7a049e70d3df index 246f8dafa..4de653094 100644 --- a/src/generated/resources/.cache/2b1c4c301b77a741c666834d476e7a049e70d3df +++ b/src/generated/resources/.cache/2b1c4c301b77a741c666834d476e7a049e70d3df @@ -1,4 +1,4 @@ -// 1.21 2024-12-10T15:33:39.9350911 Tags for minecraft:block mod id deeperdarker +// 1.21.1 2025-01-09T19:24:08.7592081 Tags for minecraft:block mod id deeperdarker 9d236ad52ffab14efb6405a34d837dafff77e363 data/c/tags/block/ores.json ec4e45d46ce1593f9bb4b226a1e3d143bc0942c6 data/c/tags/block/ores/coal.json dc2be5311ef04baad7565936ffafc6dcea324cf1 data/c/tags/block/ores/copper.json diff --git a/src/generated/resources/.cache/2cdab8a05c139b60806a3879962e52a7f2933554 b/src/generated/resources/.cache/2cdab8a05c139b60806a3879962e52a7f2933554 index a1b8b4167..cae5e1d9d 100644 --- a/src/generated/resources/.cache/2cdab8a05c139b60806a3879962e52a7f2933554 +++ b/src/generated/resources/.cache/2cdab8a05c139b60806a3879962e52a7f2933554 @@ -1,4 +1,4 @@ -// 1.21 2024-12-10T14:40:49.3748635 Item Models: deeperdarker +// 1.21.1 2025-01-09T19:24:08.7720272 Item Models: deeperdarker b36185a1f9e1c105ef9ef404ee0483eedd9ecd79 assets/deeperdarker/models/item/ancient_vase.json f881938170f499585ba6c7f76f57e4296cfc2007 assets/deeperdarker/models/item/angler_fish.json 63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/deeperdarker/models/item/angler_fish_spawn_egg.json diff --git a/src/generated/resources/.cache/56da682b774a711e2ae6b1d3933cc0dfb33b99d9 b/src/generated/resources/.cache/56da682b774a711e2ae6b1d3933cc0dfb33b99d9 index 7bf6e8499..c8b04dd91 100644 --- a/src/generated/resources/.cache/56da682b774a711e2ae6b1d3933cc0dfb33b99d9 +++ b/src/generated/resources/.cache/56da682b774a711e2ae6b1d3933cc0dfb33b99d9 @@ -1,4 +1,4 @@ -// 1.21 2024-07-11T18:05:40.1702722 Global Loot Modifiers : deeperdarker +// 1.21.1 2025-01-09T19:24:08.7886445 Global Loot Modifiers : deeperdarker 38940295b1b7b8305775ff1a2ea178d85c4fb244 data/deeperdarker/loot_modifiers/warden_carapace_from_ancient_city.json 04b2b12c4727adc512024cdabfc9e57a4f83674a data/deeperdarker/loot_modifiers/warden_carapace_from_warden.json 9703affbd6e9b85312e69ae2abee3138a9619082 data/deeperdarker/loot_modifiers/warden_heart_from_warden.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index b64744984..44bb4d0d9 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.21 2024-12-11T18:41:22.4835993 Loot Tables +// 1.21.1 2025-01-09T19:24:08.7768739 Loot Tables bc6179f8206f619874471f98bbf66966c53d7ab3 data/deeperdarker/loot_table/blocks/ancient_vase.json 006429d2ca86d8c54cd1448e51b2ffd95ef52b52 data/deeperdarker/loot_table/blocks/blooming_moss_block.json 83d5214bb3d38ec9ae0d4f6323a2757cc8cd9cdd data/deeperdarker/loot_table/blocks/blooming_sculk_stone.json diff --git a/src/generated/resources/.cache/5e6a331e51b12074ee68391963c1cb803c27d050 b/src/generated/resources/.cache/5e6a331e51b12074ee68391963c1cb803c27d050 index 9562895ff..8d443181c 100644 --- a/src/generated/resources/.cache/5e6a331e51b12074ee68391963c1cb803c27d050 +++ b/src/generated/resources/.cache/5e6a331e51b12074ee68391963c1cb803c27d050 @@ -1,2 +1,2 @@ -// 1.21 2024-12-11T18:37:10.366385 Languages: en_us for mod: deeperdarker +// 1.21.1 2025-01-09T19:24:08.7688385 Languages: en_us for mod: deeperdarker 411853c019bc2e3c0cbee741204f1e4465f1e9ae assets/deeperdarker/lang/en_us.json diff --git a/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e b/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e index 6d6c8f160..17ff01b83 100644 --- a/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e +++ b/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e @@ -1,2 +1,2 @@ -// 1.21 2024-12-10T15:46:45.4270759 Sound Definitions +// 1.21.1 2025-01-09T19:24:08.8002246 Sound Definitions 4dfd9091b7d7704f502047fddf1e9001a9b35a89 assets/deeperdarker/sounds.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 7335beeba..f662f2877 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.21 2024-12-11T18:56:50.0524041 Recipes +// 1.21.1 2025-01-09T19:24:08.7845566 Recipes ff2b4eded29e6aee06a2b8a67ed2460d6b44574c data/deeperdarker/advancement/recipes/building_blocks/bloom_planks.json 2b96f477889839f16134ded19ef45829d1ef94d3 data/deeperdarker/advancement/recipes/building_blocks/bloom_slab.json 67da220cbe51e2cdd8ce24d17eacc2558e4ba816 data/deeperdarker/advancement/recipes/building_blocks/bloom_stairs.json diff --git a/src/generated/resources/.cache/b2a5cff36cd7898e89c581bb80c5da767a3f79d1 b/src/generated/resources/.cache/b2a5cff36cd7898e89c581bb80c5da767a3f79d1 index b06bd1323..133138be6 100644 --- a/src/generated/resources/.cache/b2a5cff36cd7898e89c581bb80c5da767a3f79d1 +++ b/src/generated/resources/.cache/b2a5cff36cd7898e89c581bb80c5da767a3f79d1 @@ -1,4 +1,4 @@ -// 1.21 2024-12-10T15:29:03.9229172 Tags for minecraft:item mod id deeperdarker +// 1.21.1 2025-01-09T19:24:08.7672909 Tags for minecraft:item mod id deeperdarker ece1a1e2a4a6f21c593a611ae9126ff341767989 data/c/tags/item/foods/cooked_fish.json 47f7947e255ebbd71583d60670df2ea649e9d376 data/c/tags/item/foods/raw_fish.json 9d236ad52ffab14efb6405a34d837dafff77e363 data/c/tags/item/ores.json diff --git a/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 b/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 index cd2a6bfe5..f0e401473 100644 --- a/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 +++ b/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 @@ -1,4 +1,4 @@ -// 1.21 2024-08-07T23:40:53.3022087 Advancements +// 1.21.1 2025-01-09T19:24:08.8002246 Advancements b3553bff6389e34dddfb71e3a22a03373349d317 data/deeperdarker/advancement/main/enter_otherside.json 50c4f7a2193d578ee5ccf92c6a42d5b8107c4a29 data/deeperdarker/advancement/main/explore_otherside.json 5d6f44aefecf4155003e31cf8b2c9a98d5f90c19 data/deeperdarker/advancement/main/find_ancient_city.json