From d1a55a147e77131b1ff40acbdf77b1eeca3b7df0 Mon Sep 17 00:00:00 2001 From: sciwhiz12 Date: Tue, 14 Dec 2021 03:32:53 +0800 Subject: [PATCH] Fix datagen test for sounds definitions provider (#8249) --- src/generated_test/resources/.cache/cache | 6 ++- .../assets/data_gen_test/sounds.json | 24 ++++++------ .../advancements/obtain_dirt.json | 37 ++++++++++++++++++ .../minecraft/advancements/good_parent.json | 38 +++++++++++++++++++ .../advancements/obtain_diamond_block.json | 37 ++++++++++++++++++ .../minecraft/advancements/story/root.json | 37 ++++++++++++++++++ .../debug/DataGeneratorTest.java | 21 ++++++---- 7 files changed, 179 insertions(+), 21 deletions(-) create mode 100644 src/generated_test/resources/data/data_gen_test/advancements/obtain_dirt.json create mode 100644 src/generated_test/resources/data/minecraft/advancements/good_parent.json create mode 100644 src/generated_test/resources/data/minecraft/advancements/obtain_diamond_block.json create mode 100644 src/generated_test/resources/data/minecraft/advancements/story/root.json diff --git a/src/generated_test/resources/.cache/cache b/src/generated_test/resources/.cache/cache index 7138dae388..1ea125e07d 100644 --- a/src/generated_test/resources/.cache/cache +++ b/src/generated_test/resources/.cache/cache @@ -55,7 +55,7 @@ db2cd929128c8a6e8e0b02437f90ad8d24238206 assets/data_gen_test/models/block/torch 098d8b38409fff6cc14a4e56355bedb1fc5931d1 assets/data_gen_test/models/item/test_block.json b029993275f16569b0edf093362f55df6ea6f9be assets/data_gen_test/models/item/test_block_model.json 726e1884e53151492ca05bd752c67031603570f6 assets/data_gen_test/models/item/test_generated_model.json -61e57e44de5506da3937499a4fe46f84b856ba52 assets/data_gen_test/sounds.json +efff3d1ac1640a0d26d059aff55853652a14aca2 assets/data_gen_test/sounds.json 0f434609c4d9a5f36cf7ec56cb2f0ce26a4153fa assets/minecraft/blockstates/acacia_button.json 1767c874758bd7c3235db446b6219e6e1edd25b4 assets/minecraft/blockstates/acacia_door.json e41383b4c13ec922c0f5cfa2cc313d88fd294685 assets/minecraft/blockstates/acacia_fence.json @@ -89,6 +89,7 @@ cf16f861eaf5815238c2278eb48bde0688cb73b7 assets/scaffolding_test/blockstates/sca 8c1969250406edfbd470cc06aca4dcccfd6ce682 data/custom_tag_types_test/tags/enchantments/fire.json 44985f1cb0df54b632187ed97a6a443455f1e51c data/custom_tag_types_test/tags/potions/damage.json 806659ba3e9c12797df0fe7211a222795834fdfd data/data_gen_test/advancements/conditional.json +0001aa55877ddee50e3180db7337e926797d7e4d data/data_gen_test/advancements/obtain_dirt.json 76e760c8e8a1bbd3fb5538bc2d773c117016c0ce data/data_gen_test/advancements/recipes/conditional2.json ed4cbf1a3a2f5d8969f6346fdc9acdbe81d0c919 data/data_gen_test/recipes/conditional.json ca9827bff0a49957e01cf3887ef5131ad8710320 data/data_gen_test/recipes/conditional2.json @@ -101,4 +102,7 @@ f4d3a59005dafa334c835e43ed0047487e17324d data/forge/loot_modifiers/global_loot_m 5bd8a05038d2633f89b3b1c5ac319eb4b347b335 data/global_loot_test/loot_modifiers/dungeon_loot.json f65e40b06ce7ad18e053ec88058b951f98ae5f40 data/global_loot_test/loot_modifiers/smelting.json a263b2535439eb5af22cbc9aa48252d8e983eb08 data/global_loot_test/loot_modifiers/wheat_harvest.json +be30fbd8ad753b35166ef534123df4e852515cc5 data/minecraft/advancements/good_parent.json +d344b06ab85a35c448ea3fa1561c0be2978f3f1a data/minecraft/advancements/obtain_diamond_block.json +7c42eede6fe98d1291c00b084e4c1be8642102cd data/minecraft/advancements/story/root.json f10f0cf9694892eccfddfa67e0ef4aa1f24fb6db data/minecraft/tags/blocks/test_tag.json diff --git a/src/generated_test/resources/assets/data_gen_test/sounds.json b/src/generated_test/resources/assets/data_gen_test/sounds.json index f8600f648c..0dc8103c95 100644 --- a/src/generated_test/resources/assets/data_gen_test/sounds.json +++ b/src/generated_test/resources/assets/data_gen_test/sounds.json @@ -74,20 +74,15 @@ "name": "item/trident/return1", "volume": 0.8 }, - { - "name": "item/trident/return2", - "volume": 0.8, - "pitch": 1.2 - }, - { - "name": "item/trident/return3", - "volume": 0.8, - "pitch": 0.8 - }, { "name": "item/trident/return2", "volume": 0.8 }, + { + "name": "item/trident/return2", + "volume": 0.8, + "pitch": 0.8 + }, { "name": "item/trident/return2", "volume": 0.8, @@ -96,7 +91,7 @@ { "name": "item/trident/return2", "volume": 0.8, - "pitch": 0.8 + "pitch": 1.2 }, { "name": "item/trident/return3", @@ -105,12 +100,17 @@ { "name": "item/trident/return3", "volume": 0.8, - "pitch": 1.2 + "pitch": 0.8 }, { "name": "item/trident/return3", "volume": 0.8, "pitch": 0.8 + }, + { + "name": "item/trident/return3", + "volume": 0.8, + "pitch": 1.2 } ] }, diff --git a/src/generated_test/resources/data/data_gen_test/advancements/obtain_dirt.json b/src/generated_test/resources/data/data_gen_test/advancements/obtain_dirt.json new file mode 100644 index 0000000000..0b38993cd7 --- /dev/null +++ b/src/generated_test/resources/data/data_gen_test/advancements/obtain_dirt.json @@ -0,0 +1,37 @@ +{ + "display": { + "icon": { + "item": "minecraft:dirt" + }, + "title": { + "translate": "block.minecraft.dirt" + }, + "description": { + "translate": "dirt_description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "minecraft:textures/gui/advancements/backgrounds/stone.png" + }, + "criteria": { + "has_dirt": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:dirt" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_dirt" + ] + ] +} \ No newline at end of file diff --git a/src/generated_test/resources/data/minecraft/advancements/good_parent.json b/src/generated_test/resources/data/minecraft/advancements/good_parent.json new file mode 100644 index 0000000000..bbd1759186 --- /dev/null +++ b/src/generated_test/resources/data/minecraft/advancements/good_parent.json @@ -0,0 +1,38 @@ +{ + "parent": "forge:dummy_parent", + "display": { + "icon": { + "item": "minecraft:cobblestone" + }, + "title": { + "translate": "block.minecraft.cobblestone" + }, + "description": { + "text": "You got cobblestone" + }, + "frame": "task", + "show_toast": false, + "announce_to_chat": false, + "hidden": false, + "background": "minecraft:textures/gui/advancements/backgrounds/stone.png" + }, + "criteria": { + "get_cobbleStone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:cobblestone" + ] + } + ] + } + } + }, + "requirements": [ + [ + "get_cobbleStone" + ] + ] +} \ No newline at end of file diff --git a/src/generated_test/resources/data/minecraft/advancements/obtain_diamond_block.json b/src/generated_test/resources/data/minecraft/advancements/obtain_diamond_block.json new file mode 100644 index 0000000000..a9e9a141a9 --- /dev/null +++ b/src/generated_test/resources/data/minecraft/advancements/obtain_diamond_block.json @@ -0,0 +1,37 @@ +{ + "display": { + "icon": { + "item": "minecraft:diamond_block" + }, + "title": { + "translate": "block.minecraft.diamond_block" + }, + "description": { + "text": "You obtained a DiamondBlock" + }, + "frame": "challenge", + "show_toast": true, + "announce_to_chat": true, + "hidden": false, + "background": "minecraft:textures/gui/advancements/backgrounds/stone.png" + }, + "criteria": { + "obtained_diamond_block": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:diamond_block" + ] + } + ] + } + } + }, + "requirements": [ + [ + "obtained_diamond_block" + ] + ] +} \ No newline at end of file diff --git a/src/generated_test/resources/data/minecraft/advancements/story/root.json b/src/generated_test/resources/data/minecraft/advancements/story/root.json new file mode 100644 index 0000000000..2fa58caf7b --- /dev/null +++ b/src/generated_test/resources/data/minecraft/advancements/story/root.json @@ -0,0 +1,37 @@ +{ + "display": { + "icon": { + "item": "minecraft:grass_block" + }, + "title": { + "translate": "advancements.story.root.title" + }, + "description": { + "text": "Changed Description" + }, + "frame": "task", + "show_toast": false, + "announce_to_chat": false, + "hidden": false, + "background": "minecraft:textures/gui/advancements/backgrounds/stone.png" + }, + "criteria": { + "crafting_table": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:crafting_table" + ] + } + ] + } + } + }, + "requirements": [ + [ + "crafting_table" + ] + ] +} \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/DataGeneratorTest.java b/src/test/java/net/minecraftforge/debug/DataGeneratorTest.java index 6901f43e6c..45a38783fa 100644 --- a/src/test/java/net/minecraftforge/debug/DataGeneratorTest.java +++ b/src/test/java/net/minecraftforge/debug/DataGeneratorTest.java @@ -53,6 +53,7 @@ import net.minecraftforge.common.data.SoundDefinitionsProvider; import org.apache.commons.lang3.tuple.Triple; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.jetbrains.annotations.Nullable; import org.jline.utils.InputStreamReader; import com.google.common.collect.HashMultimap; @@ -297,14 +298,14 @@ public class DataGeneratorTest //item.trident.return this.add(SoundEvents.TRIDENT_RETURN, definition().with( sound("item/trident/return1").volume(0.8), - sound("item/trident/return2").pitch(1.2).volume(0.8), - sound("item/trident/return3").pitch(0.8).volume(0.8), sound("item/trident/return2").volume(0.8), - sound("item/trident/return2").pitch(1.2).volume(0.8), sound("item/trident/return2").pitch(0.8).volume(0.8), + sound("item/trident/return2").pitch(1.2).volume(0.8), + sound("item/trident/return2").pitch(1.2).volume(0.8), sound("item/trident/return3").volume(0.8), - sound("item/trident/return3").pitch(1.2).volume(0.8), - sound("item/trident/return3").pitch(0.8).volume(0.8) + sound("item/trident/return3").pitch(0.8).volume(0.8), + sound("item/trident/return3").pitch(0.8).volume(0.8), + sound("item/trident/return3").pitch(1.2).volume(0.8) ).subtitle("subtitles.item.trident.return")); //music_disc.blocks @@ -362,12 +363,16 @@ public class DataGeneratorTest private List compareAndGatherErrors(final Triple triple) { - return this.compare(triple.getRight(), triple.getMiddle()).stream().map(it -> triple.getLeft() + ": " + it).collect(Collectors.toList()); + return this.compare(triple.getMiddle(), triple.getRight()).stream().map(it -> triple.getLeft() + ": " + it).collect(Collectors.toList()); } - private List compare(final JsonElement vanilla, final JsonElement generated) + private List compare(final JsonElement vanilla, @Nullable final JsonElement generated) { - if (vanilla.isJsonPrimitive()) + if (generated == null) + { + return Collections.singletonList("vanilla element has no generated counterpart"); + } + else if (vanilla.isJsonPrimitive()) { return this.comparePrimitives(vanilla.getAsJsonPrimitive(), generated); }