Initial port to 1.21.4

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.168'
+    id 'net.neoforged.gradle.userdev' version '7.0.171'
     id 'net.darkhax.curseforgegradle' version '1.1.25'
     id 'com.modrinth.minotaur' version "2.+"
 }
@@ -45,7 +45,7 @@ runs {
         programArgument '--nogui'
     }
 
-    data {
+    clientData {
         // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it
         // workingDirectory project.file('run-data')
 
@@ -94,35 +94,35 @@ repositories {
 dependencies {
     implementation "net.neoforged:neoforge:${neo_version}"
 
-    compileOnly "mezz.jei:jei-${jei_minecraft}-common-api:${jei_version}"
-    compileOnly "mezz.jei:jei-${jei_minecraft}-neoforge-api:${jei_version}"
+//    compileOnly "mezz.jei:jei-${jei_minecraft}-common-api:${jei_version}"
+//    compileOnly "mezz.jei:jei-${jei_minecraft}-neoforge-api:${jei_version}"
 
-    localRuntime "mezz.jei:jei-${jei_minecraft}-neoforge:${jei_version}"
+//    localRuntime "mezz.jei:jei-${jei_minecraft}-neoforge:${jei_version}"
 
-    compileOnly "me.shedaniel.cloth:cloth-config-neoforge:${cloth_config_version}"
-    compileOnly "dev.architectury:architectury-neoforge:${architectury_version}"
-    compileOnly "me.shedaniel:RoughlyEnoughItems-api-neoforge:${rei_version}"
-    compileOnly "me.shedaniel:RoughlyEnoughItems-default-plugin-neoforge:${rei_version}"
+//    compileOnly "me.shedaniel.cloth:cloth-config-neoforge:${cloth_config_version}"
+//    compileOnly "dev.architectury:architectury-neoforge:${architectury_version}"
+//    compileOnly "me.shedaniel:RoughlyEnoughItems-api-neoforge:${rei_version}"
+//    compileOnly "me.shedaniel:RoughlyEnoughItems-default-plugin-neoforge:${rei_version}"
 
-    compileOnly "me.shedaniel:RoughlyEnoughItems-neoforge:${rei_version}"
+//    compileOnly "me.shedaniel:RoughlyEnoughItems-neoforge:${rei_version}"
 
 //    implementation "com.blamejared.crafttweaker:CraftTweaker-neoforge-${mc_version}:${crafttweaker_version}"
 
-    compileOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}:api"
-    localRuntime "top.theillusivec4.curios:curios-neoforge:${curios_version}"
+//    compileOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}:api"
+//    localRuntime "top.theillusivec4.curios:curios-neoforge:${curios_version}"
 
-    compileOnly "vazkii.patchouli:Patchouli:${patchouli_version}"
-    localRuntime "vazkii.patchouli:Patchouli:${patchouli_version}"
+//    compileOnly "vazkii.patchouli:Patchouli:${patchouli_version}"
+//    localRuntime "vazkii.patchouli:Patchouli:${patchouli_version}"
 
-    compileOnly "xyz.brassgoggledcoders:PatchouliProvider:${patchouli_provider_version}"
-    localRuntime "xyz.brassgoggledcoders:PatchouliProvider:${patchouli_provider_version}"
+//    compileOnly "xyz.brassgoggledcoders:PatchouliProvider:${patchouli_provider_version}"
+//    localRuntime "xyz.brassgoggledcoders:PatchouliProvider:${patchouli_provider_version}"
 
-    compileOnly "curse.maven:jade-324717:5639932" //Jade (WAILA)
-    localRuntime "curse.maven:jade-324717:5639932" //Jade (WAILA)
-//    runtimeOnly "curse.maven:TheOneProbe-245211:5084077" //The One probe (TOP)
+//    compileOnly "curse.maven:jade-324717:${jade_id}" //Jade (WAILA)
+//    localRuntime "curse.maven:jade-324717:${jade_id}" //Jade (WAILA)
+//    compileOnly "curse.maven:TheOneProbe-245211:5836106" //The One probe (TOP)
 
-    localRuntime "curse.maven:powah-rearchitected-633483:5608949" //Powah
-    localRuntime "curse.maven:cloth-config-348521:5623420" //Cloth Config (Dep for Powah)
+//    localRuntime "curse.maven:powah-rearchitected-633483:5608949" //Powah
+//    localRuntime "curse.maven:cloth-config-348521:5623420" //Cloth Config (Dep for Powah)
 }
 
 jar {

changelog.md

@@ -1,2 +0,0 @@
-* Add a chance to get an egg from a looting upgraded Chicken Statue
-* Fix a potential bug where villagers always drop the same statue instead of a random of the 4 variants 

gradle.properties

@@ -5,10 +5,10 @@ org.gradle.daemon=false
 org.gradle.debug=false
 
 # Base info
-mc_version=1.21.1
-neo_version=21.1.77
-neogradle.subsystems.parchment.minecraftVersion=1.21
-neogradle.subsystems.parchment.mappingsVersion=2024.07.28
+mc_version=1.21.4
+neo_version=21.4.1-beta
+neogradle.subsystems.parchment.minecraftVersion=1.21.1
+neogradle.subsystems.parchment.mappingsVersion=2024.11.17
 neogradle.subsystems.conventions.runs.create-default-run-per-type=false
 mod_group=com.shynieke.statues
 mod_id=statues
@@ -23,12 +23,13 @@ modrinth_id=hsCeX7k7
 version=0.4.15
 
 # Dependencies
-jei_minecraft=1.21.1
-jei_version=19.19.0.220
+#jei_minecraft=1.21.1
+#jei_version=19.19.0.220
 #crafttweaker_version=21.0.3
-rei_version=16.0.777
-architectury_version=13.0.6
-cloth_config_version=15.0.140
-curios_version=9.0.11+1.21
-patchouli_version=1.21-87-NEOFORGE
-patchouli_provider_version=1.21.1-1.0.11-Snapshot.3
+#rei_version=16.0.777
+#architectury_version=13.0.6
+#cloth_config_version=15.0.140
+#curios_version=9.0.15+1.21.3
+#patchouli_version=1.21-87-NEOFORGE
+#patchouli_provider_version=1.21.1-1.0.11-Snapshot.3
+#jade_id=5846076

src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924

@@ -1,4 +1,4 @@
-// 1.21.1	2024-08-11T14:53:50.3815318	Registries
+// 1.21.4	2024-12-03T21:55:30.3457113	Registries
 bc7ea3f904e7fb36de7d3656abc98016c75a776f data/statues/jukebox_song/credits.json
 aca6701e2de1d3dcb9a0430456d039bae0872717 data/statues/neoforge/biome_modifier/add_fewer_statue_bat_spawn.json
 760c99e0a58a4a3df8d4af59608f1b91e6e06b77 data/statues/neoforge/biome_modifier/add_statue_bat_spawn.json

src/generated/resources/.cache/3f45eedf5e40beff2a92fdcf50d6270c70fdb8e6

@@ -1,3 +1,3 @@
-// 1.21.1	2024-08-11T14:53:50.3770322	Tags for minecraft:worldgen/biome mod id statues
+// 1.21.4	2024-12-03T21:55:30.3387052	Tags for minecraft:worldgen/biome mod id statues
 04ac0a28392a7ff31602fa82ebe378e64220b060 data/statues/tags/worldgen/biome/can_spawn_fewer_statue_bat.json
-57b9bc73504d77a105ed8da0e7b56fcdf9c2c74c data/statues/tags/worldgen/biome/can_spawn_statue_bat.json
+d53c843400a1dbb4ebf99c1a390b04994bae4a9a data/statues/tags/worldgen/biome/can_spawn_statue_bat.json

src/generated/resources/.cache/4a65d95ba5c1c1c09e5bd2f85262b17bca6ea80d

@@ -1,2 +1,2 @@
-// 1.21.1	2024-09-05T19:45:11.278503	Languages: en_us for mod: statues
-f24d78b394e3633c0e8f73f3b1578bf52d756460 assets/statues/lang/en_us.json
+// 1.21.4	2024-12-03T21:48:09.5085958	Languages: en_us for mod: statues
+d99ee1cfb37b091fb08b6bab47236bf04793320e assets/statues/lang/en_us.json

src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d

@@ -1,4 +1,4 @@
-// 1.21.1	2024-08-11T14:53:50.3785331	Loot Tables
+// 1.21.4	2024-12-03T21:55:30.3437094	Loot Tables
 63ebf6ea91a5210188bc8165299f0beaa5759208 data/statues/loot_table/blocks/allay_statue.json
 0e0103dece0812379551b1784138d8a1da8d34b9 data/statues/loot_table/blocks/angry_bee_statue.json
 b2974bee64db4765febe3eb74ef004981402308e data/statues/loot_table/blocks/axolotl_blue_statue.json

src/generated/resources/.cache/5e9f99de52df90fff0eca2705b8d4af79b8c83be

@@ -1,3 +1,3 @@
-// 1.21.1	2024-08-11T14:53:50.3840325	Tags for minecraft:block mod id statues
+// 1.21.4	2024-12-03T21:55:30.3467229	Tags for minecraft:block mod id statues
 e0104da29651b73003011e7b3a36204a7089abf8 data/statues/tags/block/is_tropical_fish.json
 5850f4c8d068888c785daf81c0fe8fb91828d352 data/statues/tags/block/statues.json

src/generated/resources/.cache/62888ce2b9547abf000d004b13c12bacb5ffaca1

@@ -1,4 +1,4 @@
-// 1.21.1	2024-09-30T20:37:28.7891398	Block States: statues
+// 1.21.4	2024-12-03T21:48:09.5085958	Block States: statues
 4427e42906b8877f46bd091919b793be75c3018b assets/statues/blockstates/allay_statue.json
 42d5ac316c690763e56b4fc0cab4ff995f42790a assets/statues/blockstates/angry_bee_statue.json
 a969b3fd05f50339960b7a4fee7a0200e2a085c4 assets/statues/blockstates/axolotl_blue_statue.json

src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e

@@ -1,2 +1,2 @@
-// 1.21.1	2024-08-11T14:53:50.3850328	Sound Definitions
+// 1.21.4	2024-12-03T21:48:09.5105981	Sound Definitions
 a13d81ffd6d8c2ca16d927669a4254399b64d01a assets/statues/sounds.json

src/generated/resources/.cache/79843005accff9521f87d6395bb5f230a222a908

@@ -0,0 +1,92 @@
+// 1.21.4	2024-12-03T21:55:30.3397052	Statues Recipes
+18e987dfadfe8b3a50e692cace2f8740225aa39b data/statues/advancement/recipes/decorations/display_stand_from_quartz_block_stonecutting.json
+63a4b8f8cbc1656364761abc74c1b083424037a7 data/statues/advancement/recipes/misc/info_statue.json
+19084d3ced99bf522cf7e8705ebdeb8ce8c04c44 data/statues/advancement/recipes/misc/statue_core.json
+b6d4957c7a93a1c517d6db67df0e43acd4d3ae97 data/statues/advancement/recipes/misc/statue_table.json
+7c5fd0b1b881db640bdb36e75d951f3e22452e42 data/statues/recipe/display_stand_from_quartz_block_stonecutting.json
+05bdfa743e08ff061bef482be9b46bac205a1407 data/statues/recipe/info_statue.json
+77766ef48d60ee7958711f0101752814d8a97e24 data/statues/recipe/loot/allay_statue.json
+3e65c139f53623c29724d431ad389f83a7f0042e data/statues/recipe/loot/axolotl_blue_statue.json
+52ac47f0bd0fd2a1d2924f716512e82a5cd3941f data/statues/recipe/loot/axolotl_cyan_statue.json
+2dbbc46ad68505a83e1ace2284654cfb2d8f4b7b data/statues/recipe/loot/axolotl_gold_statue.json
+cf5f7f716199091cdc2ba0c7d5e1c1afa24c44f6 data/statues/recipe/loot/axolotl_lucy_statue.json
+a69d42b44924dd05d8826adaeb509ac9cf94a7c3 data/statues/recipe/loot/axolotl_wild_statue.json
+d34b834cdf66efa92c4e413fdbdfbaf232597166 data/statues/recipe/loot/baby_zombie_statue.json
+b9c605c415873e737c3989775841dc008c04bc84 data/statues/recipe/loot/bee_statue.json
+58343b8dc0c93a0698552c9aaf64e80dcc13700e data/statues/recipe/loot/blaze_statue.json
+993ac49e6e475361458ccbc347ddd0d111514925 data/statues/recipe/loot/brown_mooshroom_statue.json
+a9aa1b507a84a4f5ed5d2f7bf9f4907625d48a20 data/statues/recipe/loot/campfire_statue.json
+77d1b368da600b7f64356c109d5308c56c7ad778 data/statues/recipe/loot/cat_statue.json
+7f9f455acf214f5305f706feab9ee4129d5d8a94 data/statues/recipe/loot/chicken_jockey_statue.json
+062f0fbd1eecac7bb7f78812e21d3c0b7254abca data/statues/recipe/loot/chicken_statue.json
+62d3952ebf9855ab3f950eb8876ad926d952675d data/statues/recipe/loot/cod_statue.json
+0b75bf56acf7f19015f1e8e83e754f5f4b1c7b35 data/statues/recipe/loot/cow_statue.json
+eb39506f492f293ac9c3438b4f3f9b4da1aa19a1 data/statues/recipe/loot/creeper_statue.json
+8609b605f10b04726f18283e2c27988cae874ca3 data/statues/recipe/loot/dolphin_statue.json
+1ba920ec37d86c9fb4c04aec8fc3aa51a972dfc0 data/statues/recipe/loot/drowned_statue.json
+a0fd089c128642bb94905479dc238f6aa8d49fc5 data/statues/recipe/loot/elder_guardian_statue.json
+c7ab4fd4559cab6d7c1420d5fa1728ab9baca288 data/statues/recipe/loot/enderman_statue.json
+3bb45d1d777d4f66de28522a7a1c26ecbcd59fc1 data/statues/recipe/loot/evoker_statue.json
+5d58b0fbbeb77f5fdfdf176a0d886d535d029536 data/statues/recipe/loot/flood_statue.json
+6837521d91e201abd1ee1e73c6aa5f15f560de13 data/statues/recipe/loot/fox_statue.json
+da27576728b9be9e6b7ec955da1f616379fc52ad data/statues/recipe/loot/frog_cold_statue.json
+70cb9ab02e9b8624e08e324fa30ab404c11f49e6 data/statues/recipe/loot/frog_temperate_statue.json
+c51da032d0f84c11bb64cc69600f4ef9d46b5719 data/statues/recipe/loot/frog_warm_statue.json
+f2cf6ed9261bdaa224199783dc9cb214d80f11da data/statues/recipe/loot/ghast_statue.json
+183110e0618240bd459e5dd4ef92f9d66c5e873c data/statues/recipe/loot/guardian_statue.json
+83be29987f5dead99c957017d7d7d303848eca69 data/statues/recipe/loot/husk_statue.json
+a6d1b93b2d8d1eacd329f78ba3f61a42f3b93746 data/statues/recipe/loot/king_cluck_statue.json
+ac969529635be0052d63fea4cfa8700709752f10 data/statues/recipe/loot/magma_statue.json
+aa2deb1ede3cdbf5229e7615f921e06f015c0afd data/statues/recipe/loot/mooshroom_statue.json
+2f85276644e1fc3c585c26d0b5fcc3c6e8b2390e data/statues/recipe/loot/panda_statue.json
+a568116454236667cc051562a691cd69df5b2c51 data/statues/recipe/loot/pig_statue.json
+5a9e60370963246d17e62c40977a653dbd1f5891 data/statues/recipe/loot/pillager_statue.json
+b0b61b98afb94e6214e0d5560d34cfd956d09a35 data/statues/recipe/loot/pufferfish_statue.json
+ad59af167352ded37811448862e197d7fcc6d89c data/statues/recipe/loot/rabbit_statue.json
+e64aacbcbbe641d85aee190c2eec25483bf302ec data/statues/recipe/loot/ravager_statue.json
+83cbd32e074a28a7059f708e48f2e654ad9f71bd data/statues/recipe/loot/salmon_statue.json
+7e7e5cebd91ad5a9cc393185cf498eb1fc81070e data/statues/recipe/loot/sheep_shaven_statue.json
+3fd47ec6d689cebce487289164003dfed836f427 data/statues/recipe/loot/sheep_statue_black.json
+3b45d489396a13f779315b9425ca87622a4ae32e data/statues/recipe/loot/sheep_statue_blue.json
+18479a90268cf2850eddc9b2c700bda24d79cb53 data/statues/recipe/loot/sheep_statue_brown.json
+093378fc1a8b9ddbc117aefea241ea5954eb9903 data/statues/recipe/loot/sheep_statue_cyan.json
+9b87540268094b30eec5fb247e56a154b190d8a0 data/statues/recipe/loot/sheep_statue_gray.json
+b763ebd0436a6138d82185b7beaa4c236e5dca85 data/statues/recipe/loot/sheep_statue_green.json
+3239fec634f306a34bc8bbf50c9b840e808e32c2 data/statues/recipe/loot/sheep_statue_light_blue.json
+c307d99b5ef28953aef1fe877a767927ae36525f data/statues/recipe/loot/sheep_statue_light_gray.json
+cb1a7e098ec5afcb79586b47f2b120642c6301c9 data/statues/recipe/loot/sheep_statue_lime.json
+2500a7c97fd68f467c4f5846d570e362232fbfbc data/statues/recipe/loot/sheep_statue_magenta.json
+b74ea1618833ecb823dbd12020fb45e3c8ffdcd0 data/statues/recipe/loot/sheep_statue_orange.json
+887af237fd6fdba83d037d9316d443f533444573 data/statues/recipe/loot/sheep_statue_pink.json
+21684909b50dd51702b557e5c43a07b207b32424 data/statues/recipe/loot/sheep_statue_purple.json
+2999932a689667eb2f02c71f51ac8878d1897739 data/statues/recipe/loot/sheep_statue_red.json
+b05e7ba1ad22ba7726135db1a79bc78926ef83e3 data/statues/recipe/loot/sheep_statue_white.json
+98761b180fab296d83306d80dcfbfc41419304bb data/statues/recipe/loot/sheep_statue_yellow.json
+314c542724b24cb5401e022d4fe3c032a8e7e3af data/statues/recipe/loot/shulker_statue.json
+d677a2442d1a931914a6b1f075ee1a294656567d data/statues/recipe/loot/slime_statue.json
+63ed528cef1e249b28ce203da0bc200459f29b32 data/statues/recipe/loot/snow_golem_statue.json
+7d447cf573eca8997e39f5398dd0ee8310ac04ac data/statues/recipe/loot/spider_statue.json
+a1c2f6b551b75f44738f7877a56dc0e7a46e18d0 data/statues/recipe/loot/squid_statue.json
+bc6fc5771d412bcb376829771ad84f2ae7dd0e7c data/statues/recipe/loot/tropical_fish.json
+f2d3456bcab887ae56ca89b3a49769b25fc1ba8d data/statues/recipe/loot/turtle_statue.json
+9a075b2a399bd59a2fae490c5bf5069baad8d621 data/statues/recipe/loot/villager_statue.json
+2e398dbc66a1a11631df2eec4911dcc039928efc data/statues/recipe/loot/vindicator_statue.json
+8b27299ac922043db935f90c61b6f8e133184f13 data/statues/recipe/loot/warden_statue.json
+f200b2f98e1229b26d0d57f0f0b47ee4380173b7 data/statues/recipe/loot/wasteland_statue.json
+167b1481738cce9e05293d2c5889d39ec4d2c966 data/statues/recipe/loot/witch_statue.json
+8cdd4433d82a1be3de1d44b2a92c115217a98814 data/statues/recipe/loot/zombie_statue.json
+fa27eaabcd66330e5738b12f6abe5c60d0de4d14 data/statues/recipe/statue_core.json
+14b4fa5d97f73b1c1020431d4d17ab23d826f06a data/statues/recipe/statue_table.json
+229ea87ae5dc0b931f59a34bf3e48e9e1dcddae5 data/statues/recipe/upgrade/automation.json
+548fe77f63db87c3b2c06f2737e3e3cbc18d6c1c data/statues/recipe/upgrade/despawner.json
+55334c65a5cdd549fca73c7a317703c83f3576d9 data/statues/recipe/upgrade/glowing.json
+f5e2b8022dc138dc207d93cc03e4ede86909b42d data/statues/recipe/upgrade/interaction.json
+6f36cbf0b4293f7e040d468a3d64aad0fd827795 data/statues/recipe/upgrade/looting.json
+2c6533d3d5d96dc95047e9d509ae01257cc08b60 data/statues/recipe/upgrade/mob_killer.json
+a6d3bfccc50263a6916de22de7084af7db92e671 data/statues/recipe/upgrade/mob_killer_2.json
+6bb065f29074066c7d42498b7456152400a90636 data/statues/recipe/upgrade/mob_killer_3.json
+b29a630a6e2ef2feb52e5d16d2f0c0ef83dccb1b data/statues/recipe/upgrade/sound.json
+d99894341ec65bb12a5a524c4e4a0466ff988e27 data/statues/recipe/upgrade/spawner.json
+b3f5b4934a89b103e5b3e48089bf6f56066a74f1 data/statues/recipe/upgrade/speed.json
+7d7871b2ed4cf626cdbf6f34a492036086353f76 data/statues/recipe/upgrade/statue_upgrade.json
+d6cc51a83a7735e22a8749dcbc4394ceccc10aa0 data/statues/recipe/upgrade/unglowing.json

src/generated/resources/.cache/8fa013ccbf10434e23abe63f04d41f64f8518015

@@ -1,4 +1,4 @@
-// 1.21.1	2024-08-13T22:16:45.8250573	Tags for minecraft:item mod id statues
+// 1.21.4	2024-12-03T21:55:30.3417073	Tags for minecraft:item mod id statues
 95e966c60ff996797cf399bd7d3288140ba8cc6e data/curios/tags/item/statue.json
 5bcfc679cea4f2c5e4882599ec047623cfdfd711 data/minecraft/tags/item/decorated_pot_sherds.json
 a75022c454865d8cbe520ecf02bb8feeabf59d5b data/statues/tags/item/core.json