diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd49..e644113 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e09..b82aa23 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59..25da30d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
goto fail
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
goto fail
diff --git a/mappings/diff/mapping-1.20.3to1.20.5.json b/mappings/diff/mapping-1.20.3to1.20.5.json
index dee8f88..a263f6c 100644
--- a/mappings/diff/mapping-1.20.3to1.20.5.json
+++ b/mappings/diff/mapping-1.20.3to1.20.5.json
@@ -17,11 +17,11 @@
"horse.jump_strength": "generic.jump_strength"
},
"blockstates": {
- "trial_spawner[trial_spawner_state=inactive]": "",
- "trial_spawner[trial_spawner_state=waiting_for_players]": "",
- "trial_spawner[trial_spawner_state=active]": "",
- "trial_spawner[trial_spawner_state=waiting_for_reward_ejection]": "",
- "trial_spawner[trial_spawner_state=ejecting_reward]": "",
- "trial_spawner[trial_spawner_state=cooldown]": ""
+ "trial_spawner[trial_spawner_state=inactive]": "trial_spawner[ominous=false,trial_spawner_state=inactive]",
+ "trial_spawner[trial_spawner_state=waiting_for_players]": "trial_spawner[ominous=false,trial_spawner_state=waiting_for_players]",
+ "trial_spawner[trial_spawner_state=active]": "trial_spawner[ominous=false,trial_spawner_state=active]",
+ "trial_spawner[trial_spawner_state=waiting_for_reward_ejection]": "trial_spawner[ominous=false,trial_spawner_state=waiting_for_reward_ejection]",
+ "trial_spawner[trial_spawner_state=ejecting_reward]": "trial_spawner[ominous=false,trial_spawner_state=ejecting_reward]",
+ "trial_spawner[trial_spawner_state=cooldown]": "trial_spawner[ominous=false,trial_spawner_state=cooldown]"
}
}
\ No newline at end of file
diff --git a/mappings/diff/mapping-1.20.5to1.20.3.json b/mappings/diff/mapping-1.20.5to1.20.3.json
index e2f49ee..0fd7125 100644
--- a/mappings/diff/mapping-1.20.5to1.20.3.json
+++ b/mappings/diff/mapping-1.20.5to1.20.3.json
@@ -17,27 +17,28 @@
"guster_pottery_sherd": "friend_pottery_sherd",
"scrape_pottery_sherd": "blade_pottery_sherd",
"breeze_rod": "blaze_rod",
- "ominous_trial_key": "",
- "ominous_bottle": ""
+ "ominous_trial_key": "trial_key",
+ "ominous_bottle": "honey_bottle"
},
"itemnames": {
- "turtle_scute": "1.20.5 Turtle Scute",
"armadillo_scute": "1.20.5 Armadillo Scute",
"wolf_armor": "1.20.5 Wolf Armor",
"armadillo_spawn_egg": "1.20.5 Armadillo Spawn Egg",
- "vault": "1.20.5 Vault",
- "wind_charge": "1.20.5 Wind Charge",
- "bogged_spawn_egg": "1.20.5 Bogged Spawn Egg",
- "heavy_core": "1.20.5 Heavy Core",
- "mace": "1.20.5 Mace",
- "flow_banner_pattern": "1.20.5 Flow Banner Pattern",
- "guster_banner_pattern": "1.20.5 Guster Banner Pattern",
- "flow_armor_trim_smithing_template": "1.20.5 Flow Armor Trim Smithing Template",
- "bolt_armor_trim_smithing_template": "1.20.5 Bolt Armor Trim Smithing Template",
- "flow_pottery_sherd": "1.20.5 Flow Pottery Sherd",
- "guster_pottery_sherd": "1.20.5 Guster Pottery Sherd",
- "scrape_pottery_sherd": "1.20.5 Scrape Pottery Sherd",
- "breeze_rod": "1.20.5 Breeze Rod"
+ "vault": "1.21 Vault",
+ "wind_charge": "1.21 Wind Charge",
+ "bogged_spawn_egg": "1.21 Bogged Spawn Egg",
+ "heavy_core": "1.21 Heavy Core",
+ "mace": "1.21 Mace",
+ "flow_banner_pattern": "1.21 Flow Banner Pattern",
+ "guster_banner_pattern": "1.21 Guster Banner Pattern",
+ "flow_armor_trim_smithing_template": "1.21 Flow Armor Trim Smithing Template",
+ "bolt_armor_trim_smithing_template": "1.21 Bolt Armor Trim Smithing Template",
+ "flow_pottery_sherd": "1.21 Flow Pottery Sherd",
+ "guster_pottery_sherd": "1.21 Guster Pottery Sherd",
+ "scrape_pottery_sherd": "1.21 Scrape Pottery Sherd",
+ "breeze_rod": "1.21 Breeze Rod",
+ "ominous_trial_key": "1.21 Ominous Trial Key",
+ "ominous_bottle": "1.21 Ominous Bottle"
},
"sounds": {
"entity.armadillo.eat": "entity.sniffer.eat",
@@ -115,7 +116,7 @@
"armadillo": "cow",
"breeze_wind_charge": "wind_charge",
"bogged": "stray",
- "ominous_item_spawner": ""
+ "ominous_item_spawner": "text_display"
},
"entitynames": {
"armadillo": "Armadillo",
@@ -142,31 +143,31 @@
"blockstates": {
"vault": "spawner",
"heavy_core": "wither_skeleton_skull[powered=false,rotation=0]",
- "trial_spawner[ominous=true,trial_spawner_state=inactive]": "",
- "trial_spawner[ominous=true,trial_spawner_state=waiting_for_players]": "",
- "trial_spawner[ominous=true,trial_spawner_state=active]": "",
- "trial_spawner[ominous=true,trial_spawner_state=waiting_for_reward_ejection]": "",
- "trial_spawner[ominous=true,trial_spawner_state=ejecting_reward]": "",
- "trial_spawner[ominous=true,trial_spawner_state=cooldown]": "",
- "trial_spawner[ominous=false,trial_spawner_state=inactive]": "",
- "trial_spawner[ominous=false,trial_spawner_state=waiting_for_players]": "",
- "trial_spawner[ominous=false,trial_spawner_state=active]": "",
- "trial_spawner[ominous=false,trial_spawner_state=waiting_for_reward_ejection]": "",
- "trial_spawner[ominous=false,trial_spawner_state=ejecting_reward]": "",
- "trial_spawner[ominous=false,trial_spawner_state=cooldown]": ""
+ "trial_spawner[ominous=true,trial_spawner_state=inactive]": "trial_spawner[trial_spawner_state=inactive]",
+ "trial_spawner[ominous=true,trial_spawner_state=waiting_for_players]": "trial_spawner[trial_spawner_state=waiting_for_players]",
+ "trial_spawner[ominous=true,trial_spawner_state=active]": "trial_spawner[trial_spawner_state=active]",
+ "trial_spawner[ominous=true,trial_spawner_state=waiting_for_reward_ejection]": "trial_spawner[trial_spawner_state=waiting_for_reward_ejection]",
+ "trial_spawner[ominous=true,trial_spawner_state=ejecting_reward]": "trial_spawner[trial_spawner_state=ejecting_reward]",
+ "trial_spawner[ominous=true,trial_spawner_state=cooldown]": "trial_spawner[trial_spawner_state=cooldown]",
+ "trial_spawner[ominous=false,trial_spawner_state=inactive]": "trial_spawner[trial_spawner_state=inactive]",
+ "trial_spawner[ominous=false,trial_spawner_state=waiting_for_players]": "trial_spawner[trial_spawner_state=waiting_for_players]",
+ "trial_spawner[ominous=false,trial_spawner_state=active]": "trial_spawner[trial_spawner_state=active]",
+ "trial_spawner[ominous=false,trial_spawner_state=waiting_for_reward_ejection]": "trial_spawner[trial_spawner_state=waiting_for_reward_ejection]",
+ "trial_spawner[ominous=false,trial_spawner_state=ejecting_reward]": "trial_spawner[trial_spawner_state=ejecting_reward]",
+ "trial_spawner[ominous=false,trial_spawner_state=cooldown]": "trial_spawner[trial_spawner_state=cooldown]"
},
"particles": {
"vault_connection": "enchant",
"gust_emitter_large": "gust_emitter",
"gust_emitter_small": "gust_emitter",
- "small_gust": "",
- "infested": "",
- "item_cobweb": "",
- "trial_spawner_detection_ominous": "",
- "dust_pillar": "",
- "ominous_spawning": "",
- "raid_omen": "",
- "trial_omen": ""
+ "small_gust": "dust_plume",
+ "infested": "mycelium",
+ "item_cobweb": "snowflake",
+ "trial_spawner_detection_ominous": "soul_fire_flame",
+ "dust_pillar": "falling_dust",
+ "ominous_spawning": "wax_off",
+ "raid_omen": "soul",
+ "trial_omen": "soul"
},
"blockentities": {
"vault": ""
@@ -176,9 +177,5 @@
"loot_table": "brigadier:string",
"loot_predicate": "brigadier:string",
"loot_modifier": "brigadier:string"
- },
- "data_component_type": {
- "item_name": "",
- "ominous_bottle_amplifier": ""
}
}
\ No newline at end of file
diff --git a/mappings/mapping-1.20.3.json b/mappings/mapping-1.20.3.json
index 129a28e..5e5c5db 100644
--- a/mappings/mapping-1.20.3.json
+++ b/mappings/mapping-1.20.3.json
@@ -31036,6 +31036,7 @@
"damage",
"unbreakable",
"custom_name",
+ "item_name",
"lore",
"rarity",
"enchantments",
@@ -31070,6 +31071,7 @@
"bucket_entity_data",
"block_entity_data",
"instrument",
+ "ominous_bottle_amplifier",
"recipes",
"lodestone_tracker",
"firework_explosion",
diff --git a/output/backwards/mappings-1.20.5to1.20.3.nbt b/output/backwards/mappings-1.20.5to1.20.3.nbt
index ef56c1b..05291b9 100644
Binary files a/output/backwards/mappings-1.20.5to1.20.3.nbt and b/output/backwards/mappings-1.20.5to1.20.3.nbt differ
diff --git a/output/identifiers-1.20.3.nbt b/output/identifiers-1.20.3.nbt
index 2751e44..2d65b5b 100644
Binary files a/output/identifiers-1.20.3.nbt and b/output/identifiers-1.20.3.nbt differ
diff --git a/output/mappings-1.20.3to1.20.5.nbt b/output/mappings-1.20.3to1.20.5.nbt
index 61b7447..e5dc81f 100644
Binary files a/output/mappings-1.20.3to1.20.5.nbt and b/output/mappings-1.20.3to1.20.5.nbt differ