From 1988037c451ff3e4bc16965221c8277ad1116073 Mon Sep 17 00:00:00 2001 From: gottsch <17928819+gottsch@users.noreply.github.com> Date: Sun, 25 Jun 2023 18:20:44 -0400 Subject: [PATCH 1/3] update topaz key --- CHANGELOG.md | 11 +++++++++-- gradle.properties | 2 +- src/main/resources/META-INF/mods.toml | 2 +- .../treasure2/textures/item/key/topaz_key.png | Bin 2058 -> 6235 bytes update.json | 7 ++++--- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f36d91d2..6231f9ecb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [3.0.0] - 2023-06-30 +## [3.1.0] - 2023-06-25 + +### Changed + +- updated the topaz key texture to be more like the onyx key + + +## [3.0.0] - 2023-06-24 - Initial release for mc1.18.2 port. @@ -32,4 +39,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed -- Removed all Charms and charm-related contect. They are being moved to a new stand-alone mod tentatively called 'GealdorCraft', which will have built-in itegration with Treasure2. +- Removed all Charms and charm-related content. They are being moved to a new stand-alone mod tentatively called 'GealdorCraft', which will have built-in itegration with Treasure2. \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 88a691bcf..87a983237 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ package_group=gottsch # use alpha, beta, or v (for version) mod_version_type= -mod_version=3.0.0 +mod_version=3.1.0 #versions mc_version=1.18.2 diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index e07780db8..eebddae90 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -17,7 +17,7 @@ issueTrackerURL="https://github.com/gottsch/gottsch-minecraft-Treasure/issues" # modId="treasure2" #mandatory # The version number of the mod - there's a few well known ${} variables useable here or just hardcode it -version="3.0.0" #mandatory +version="3.1.0" #mandatory # A display name for the mod displayName="Treasure2" #mandatory diff --git a/src/main/resources/assets/treasure2/textures/item/key/topaz_key.png b/src/main/resources/assets/treasure2/textures/item/key/topaz_key.png index f93e08535a64a99e45d36116d1893a25f5c3aeae..df8849250bcc4575f34729466c2cfa091a32eca3 100644 GIT binary patch literal 6235 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 diff --git a/update.json b/update.json index 4fd46869b..0a31d5de0 100644 --- a/update.json +++ b/update.json @@ -1,10 +1,11 @@ { "homepage": "https://minecraft.curseforge.com/projects/treasure2", "promos": { - "1.18.2-latest": "3.0.0", - "1.18.2-recommended": "3.0.0" + "1.18.2-latest": "3.1.0", + "1.18.2-recommended": "3.1.0" }, "1.18.2": { - "3.0.0": "Initial port from 1.16.5. See https://raw.githubusercontent.com/gottsch/gottsch-minecraft-Treasure/1.18.2-master/CHANGELOG.md" + "3.0.0": "Initial port from 1.16.5. See https://raw.githubusercontent.com/gottsch/gottsch-minecraft-Treasure/1.18.2-master/CHANGELOG.md", + "3.1.0": "See https://raw.githubusercontent.com/gottsch/gottsch-minecraft-Treasure/1.18.2-master/CHANGELOG.md" } } \ No newline at end of file From a7dc8c9267c4606288f82d3a1a580fc953baebf2 Mon Sep 17 00:00:00 2001 From: gottsch Date: Tue, 11 Jul 2023 23:05:50 -0400 Subject: [PATCH 2/3] 3.1.1 --- .classpath | 20 +++++-------- gradle.properties | 2 +- .../assets/treasure2/lang/en_us.json | 5 ++++ .../treasure2/models/item/adornments_tab.json | 6 ---- .../treasure2/datagen/ItemModelsProvider.java | 4 +-- .../forge/treasure2/datagen/LanguageGen.java | 8 +++++ .../forge/treasure2/datagen/Recipes.java | 30 +++++++++++++++++++ src/main/resources/META-INF/mods.toml | 2 +- .../recipes/gravestone1_polished_granite.json | 22 -------------- .../recipes/gravestone2_polished_granite.json | 22 -------------- .../recipes/gravestone3_polished_granite.json | 22 -------------- update.json | 7 +++-- 12 files changed, 59 insertions(+), 91 deletions(-) delete mode 100644 src/generated/resources/assets/treasure2/models/item/adornments_tab.json delete mode 100644 src/main/resources/data/treasure2/recipes/gravestone1_polished_granite.json delete mode 100644 src/main/resources/data/treasure2/recipes/gravestone2_polished_granite.json delete mode 100644 src/main/resources/data/treasure2/recipes/gravestone3_polished_granite.json diff --git a/.classpath b/.classpath index d1a057074..43978c38d 100644 --- a/.classpath +++ b/.classpath @@ -2,46 +2,42 @@ - + - + - + - - + + - - + + - - - - - + diff --git a/gradle.properties b/gradle.properties index 87a983237..35c6bc5f3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ package_group=gottsch # use alpha, beta, or v (for version) mod_version_type= -mod_version=3.1.0 +mod_version=3.1.1 #versions mc_version=1.18.2 diff --git a/src/generated/resources/assets/treasure2/lang/en_us.json b/src/generated/resources/assets/treasure2/lang/en_us.json index 9e34d97cb..37127928f 100644 --- a/src/generated/resources/assets/treasure2/lang/en_us.json +++ b/src/generated/resources/assets/treasure2/lang/en_us.json @@ -61,6 +61,11 @@ "chat.treasure2.key.key_break": "Your key broke whilst attempting to unlock the lock!", "chat.treasure2.key.key_not_fit": "Your key doesn't fit the lock!", "chat.treasure2.key.key_unable_unlock": "Your key failed to unlock the lock!", + "entity.treasure2.bound_soul": "Bound Soul", + "entity.treasure2.cauldron_chest_mimic": "Cauldron Chest Mimic", + "entity.treasure2.pirate_chest_mimic": "Pirate Chest Mimic", + "entity.treasure2.viking_chest_mimic": "Viking Chest Mimic", + "entity.treasure2.wood_chest_mimic": "Wood Chest Mimic", "item.treasure2.axe_of_durin": "Axe of Durin", "item.treasure2.black_pearl": "Black Pearl", "item.treasure2.black_sword": "The Black Sword", diff --git a/src/generated/resources/assets/treasure2/models/item/adornments_tab.json b/src/generated/resources/assets/treasure2/models/item/adornments_tab.json deleted file mode 100644 index 224c3f826..000000000 --- a/src/generated/resources/assets/treasure2/models/item/adornments_tab.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "treasure2:item/adornment/ruby_gold_ring" - } -} \ No newline at end of file diff --git a/src/main/java/mod/gottsch/forge/treasure2/datagen/ItemModelsProvider.java b/src/main/java/mod/gottsch/forge/treasure2/datagen/ItemModelsProvider.java index 512df531f..981092c06 100644 --- a/src/main/java/mod/gottsch/forge/treasure2/datagen/ItemModelsProvider.java +++ b/src/main/java/mod/gottsch/forge/treasure2/datagen/ItemModelsProvider.java @@ -41,8 +41,8 @@ protected void registerModels() { singleTexture(TreasureItems.TREASURE_TAB.get().getRegistryName().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/treasure_tab")); - singleTexture(TreasureItems.ADORNMENTS_TAB.get().getRegistryName().getPath(), - mcLoc("item/generated"), "layer0", modLoc("item/adornment/ruby_gold_ring")); +// singleTexture(TreasureItems.ADORNMENTS_TAB.get().getRegistryName().getPath(), +// mcLoc("item/generated"), "layer0", modLoc("item/adornment/ruby_gold_ring")); // keys singleTexture(TreasureItems.WOOD_KEY.get().getRegistryName().getPath(), diff --git a/src/main/java/mod/gottsch/forge/treasure2/datagen/LanguageGen.java b/src/main/java/mod/gottsch/forge/treasure2/datagen/LanguageGen.java index 871705fed..a415ae2f1 100644 --- a/src/main/java/mod/gottsch/forge/treasure2/datagen/LanguageGen.java +++ b/src/main/java/mod/gottsch/forge/treasure2/datagen/LanguageGen.java @@ -19,6 +19,7 @@ import mod.gottsch.forge.treasure2.Treasure; import mod.gottsch.forge.treasure2.core.block.TreasureBlocks; +import mod.gottsch.forge.treasure2.core.entity.TreasureEntities; import mod.gottsch.forge.treasure2.core.item.TreasureItems; import mod.gottsch.forge.treasure2.core.util.LangUtil; import net.minecraft.data.DataGenerator; @@ -217,6 +218,13 @@ protected void addTranslations() { // add(TreasureItems.WITHER_STICK_ITEM.get(), "Wither Branch"); // add(TreasureItems.WITHER_ROOT_ITEM.get(), "Wither Root"); + // mobs + add(TreasureEntities.BOUND_SOUL_ENTITY_TYPE.get(), "Bound Soul"); + add(TreasureEntities.WOOD_CHEST_MIMIC_ENTITY_TYPE.get(), "Wood Chest Mimic"); + add(TreasureEntities.PIRATE_CHEST_MIMIC_ENTITY_TYPE.get(), "Pirate Chest Mimic"); + add(TreasureEntities.VIKING_CHEST_MIMIC_ENTITY_TYPE.get(), "Viking Chest Mimic"); + add(TreasureEntities.CAULDRON_CHEST_MIMIC_ENTITY_TYPE.get(), "Cauldron Chest Mimic"); + // eggs add(TreasureItems.BOUND_SOUL_EGG.get(), "Bound Soul Spawn Egg"); add(TreasureItems.WOOD_CHEST_MIMIC_EGG.get(), "Wood Chest Mimic Spawn Egg"); diff --git a/src/main/java/mod/gottsch/forge/treasure2/datagen/Recipes.java b/src/main/java/mod/gottsch/forge/treasure2/datagen/Recipes.java index 05b1564e2..423a7c1ec 100644 --- a/src/main/java/mod/gottsch/forge/treasure2/datagen/Recipes.java +++ b/src/main/java/mod/gottsch/forge/treasure2/datagen/Recipes.java @@ -19,6 +19,7 @@ import java.util.function.Consumer; +import mod.gottsch.forge.treasure2.core.block.TreasureBlocks; import mod.gottsch.forge.treasure2.core.item.TreasureItems; import net.minecraft.advancements.critereon.InventoryChangeTrigger; import net.minecraft.advancements.critereon.ItemPredicate; @@ -29,6 +30,7 @@ import net.minecraft.data.recipes.SimpleCookingRecipeBuilder; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.block.Blocks; /** * @@ -195,5 +197,33 @@ protected void buildCraftingRecipes(Consumer recipe) { Items.IRON_INGOT, 1.0f, 200) .unlockedBy("has_weapon", inventoryTrigger(ItemPredicate.Builder.item().of(TreasureItems.IRON_DWARVEN_AXE.get()).build())) .save(recipe, "iron_ingot_from_dwarven_axe"); + + // gravestones + ShapedRecipeBuilder.shaped(TreasureBlocks.GRAVESTONE1_POLISHED_GRANITE.get()) + .pattern(" t") + .pattern(" ") + .pattern(" x ") + .define('x', Blocks.POLISHED_GRANITE) + .define('t', TreasureItems.TREASURE_TOOL.get()) + .unlockedBy("has_tool", InventoryChangeTrigger.TriggerInstance.hasItems(TreasureItems.TREASURE_TOOL.get())) + .save(recipe); + + ShapedRecipeBuilder.shaped(TreasureBlocks.GRAVESTONE2_POLISHED_GRANITE.get()) + .pattern(" t") + .pattern(" x ") + .pattern(" x ") + .define('x', Blocks.POLISHED_GRANITE) + .define('t', TreasureItems.TREASURE_TOOL.get()) + .unlockedBy("has_tool", InventoryChangeTrigger.TriggerInstance.hasItems(TreasureItems.TREASURE_TOOL.get())) + .save(recipe); + + ShapedRecipeBuilder.shaped(TreasureBlocks.GRAVESTONE3_POLISHED_GRANITE.get()) + .pattern(" xt") + .pattern(" x ") + .pattern(" x ") + .define('x', Blocks.POLISHED_GRANITE) + .define('t', TreasureItems.TREASURE_TOOL.get()) + .unlockedBy("has_tool", InventoryChangeTrigger.TriggerInstance.hasItems(TreasureItems.TREASURE_TOOL.get())) + .save(recipe); } } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index eebddae90..4a5b042ba 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -17,7 +17,7 @@ issueTrackerURL="https://github.com/gottsch/gottsch-minecraft-Treasure/issues" # modId="treasure2" #mandatory # The version number of the mod - there's a few well known ${} variables useable here or just hardcode it -version="3.1.0" #mandatory +version="3.1.1" #mandatory # A display name for the mod displayName="Treasure2" #mandatory diff --git a/src/main/resources/data/treasure2/recipes/gravestone1_polished_granite.json b/src/main/resources/data/treasure2/recipes/gravestone1_polished_granite.json deleted file mode 100644 index 549aab573..000000000 --- a/src/main/resources/data/treasure2/recipes/gravestone1_polished_granite.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "Treasure2", - "pattern": [ - " T", - " ", - " S " - ], - "key": { - "T": { - "item": "treasure2:treasure_tool" - }, - "S": { - "item": "minecraft:stone", - "data":2 - } - }, - "result": { - "item": "treasure2:gravestone1_polished_granite", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/treasure2/recipes/gravestone2_polished_granite.json b/src/main/resources/data/treasure2/recipes/gravestone2_polished_granite.json deleted file mode 100644 index 791510248..000000000 --- a/src/main/resources/data/treasure2/recipes/gravestone2_polished_granite.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "Treasure2", - "pattern": [ - " T", - " S ", - " S " - ], - "key": { - "T": { - "item": "treasure2:treasure_tool" - }, - "S": { - "item": "minecraft:stone", - "data":2 - } - }, - "result": { - "item": "treasure2:gravestone2_polished_granite", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/treasure2/recipes/gravestone3_polished_granite.json b/src/main/resources/data/treasure2/recipes/gravestone3_polished_granite.json deleted file mode 100644 index ec3b98075..000000000 --- a/src/main/resources/data/treasure2/recipes/gravestone3_polished_granite.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "Treasure2", - "pattern": [ - " ST", - " S ", - " S " - ], - "key": { - "T": { - "item": "treasure2:treasure_tool" - }, - "S": { - "item": "minecraft:stone", - "data":2 - } - }, - "result": { - "item": "treasure2:gravestone3_polished_granite", - "count": 1 - } -} \ No newline at end of file diff --git a/update.json b/update.json index 0a31d5de0..0f2a31253 100644 --- a/update.json +++ b/update.json @@ -1,11 +1,12 @@ { "homepage": "https://minecraft.curseforge.com/projects/treasure2", "promos": { - "1.18.2-latest": "3.1.0", - "1.18.2-recommended": "3.1.0" + "1.18.2-latest": "3.1.1", + "1.18.2-recommended": "3.1.1" }, "1.18.2": { "3.0.0": "Initial port from 1.16.5. See https://raw.githubusercontent.com/gottsch/gottsch-minecraft-Treasure/1.18.2-master/CHANGELOG.md", - "3.1.0": "See https://raw.githubusercontent.com/gottsch/gottsch-minecraft-Treasure/1.18.2-master/CHANGELOG.md" + "3.1.0": "See https://raw.githubusercontent.com/gottsch/gottsch-minecraft-Treasure/1.18.2-master/CHANGELOG.md", + "3.1.1": "See https://raw.githubusercontent.com/gottsch/gottsch-minecraft-Treasure/1.18.2-master/CHANGELOG.md" } } \ No newline at end of file From e3227938522440050f4c39f8230ff76008b933bc Mon Sep 17 00:00:00 2001 From: gottsch Date: Tue, 11 Jul 2023 23:07:43 -0400 Subject: [PATCH 3/3] 3.1.1 --- CHANGELOG.md | 12 +++++-- .../gravestone1_polished_granite.json | 34 +++++++++++++++++++ .../gravestone2_polished_granite.json | 34 +++++++++++++++++++ .../gravestone3_polished_granite.json | 34 +++++++++++++++++++ .../recipes/gravestone1_polished_granite.json | 19 +++++++++++ .../recipes/gravestone2_polished_granite.json | 19 +++++++++++ .../recipes/gravestone3_polished_granite.json | 19 +++++++++++ 7 files changed, 169 insertions(+), 2 deletions(-) create mode 100644 src/generated/resources/data/treasure2/advancements/recipes/treasure2/gravestone1_polished_granite.json create mode 100644 src/generated/resources/data/treasure2/advancements/recipes/treasure2/gravestone2_polished_granite.json create mode 100644 src/generated/resources/data/treasure2/advancements/recipes/treasure2/gravestone3_polished_granite.json create mode 100644 src/generated/resources/data/treasure2/recipes/gravestone1_polished_granite.json create mode 100644 src/generated/resources/data/treasure2/recipes/gravestone2_polished_granite.json create mode 100644 src/generated/resources/data/treasure2/recipes/gravestone3_polished_granite.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 6231f9ecb..288e82f39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,15 +5,23 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [3.1.1] - 2023-07-11 + +### Changed + +- Added names for all mobs. +- Fixed polished granite gravestone recipes. ## [3.1.0] - 2023-06-25 +### Added + +- Added Crate and Moldy Crate mimics. + ### Changed - updated the topaz key texture to be more like the onyx key - ## [3.0.0] - 2023-06-24 - Initial release for mc1.18.2 port. diff --git a/src/generated/resources/data/treasure2/advancements/recipes/treasure2/gravestone1_polished_granite.json b/src/generated/resources/data/treasure2/advancements/recipes/treasure2/gravestone1_polished_granite.json new file mode 100644 index 000000000..6fac27386 --- /dev/null +++ b/src/generated/resources/data/treasure2/advancements/recipes/treasure2/gravestone1_polished_granite.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "treasure2:gravestone1_polished_granite" + ] + }, + "criteria": { + "has_tool": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "treasure2:treasure_tool" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "treasure2:gravestone1_polished_granite" + } + } + }, + "requirements": [ + [ + "has_tool", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/treasure2/advancements/recipes/treasure2/gravestone2_polished_granite.json b/src/generated/resources/data/treasure2/advancements/recipes/treasure2/gravestone2_polished_granite.json new file mode 100644 index 000000000..b50bb7dd1 --- /dev/null +++ b/src/generated/resources/data/treasure2/advancements/recipes/treasure2/gravestone2_polished_granite.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "treasure2:gravestone2_polished_granite" + ] + }, + "criteria": { + "has_tool": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "treasure2:treasure_tool" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "treasure2:gravestone2_polished_granite" + } + } + }, + "requirements": [ + [ + "has_tool", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/treasure2/advancements/recipes/treasure2/gravestone3_polished_granite.json b/src/generated/resources/data/treasure2/advancements/recipes/treasure2/gravestone3_polished_granite.json new file mode 100644 index 000000000..0859e69b0 --- /dev/null +++ b/src/generated/resources/data/treasure2/advancements/recipes/treasure2/gravestone3_polished_granite.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "treasure2:gravestone3_polished_granite" + ] + }, + "criteria": { + "has_tool": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "treasure2:treasure_tool" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "treasure2:gravestone3_polished_granite" + } + } + }, + "requirements": [ + [ + "has_tool", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/treasure2/recipes/gravestone1_polished_granite.json b/src/generated/resources/data/treasure2/recipes/gravestone1_polished_granite.json new file mode 100644 index 000000000..08e5341aa --- /dev/null +++ b/src/generated/resources/data/treasure2/recipes/gravestone1_polished_granite.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " t", + " ", + " x " + ], + "key": { + "x": { + "item": "minecraft:polished_granite" + }, + "t": { + "item": "treasure2:treasure_tool" + } + }, + "result": { + "item": "treasure2:gravestone1_polished_granite" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/treasure2/recipes/gravestone2_polished_granite.json b/src/generated/resources/data/treasure2/recipes/gravestone2_polished_granite.json new file mode 100644 index 000000000..cba0b1cff --- /dev/null +++ b/src/generated/resources/data/treasure2/recipes/gravestone2_polished_granite.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " t", + " x ", + " x " + ], + "key": { + "x": { + "item": "minecraft:polished_granite" + }, + "t": { + "item": "treasure2:treasure_tool" + } + }, + "result": { + "item": "treasure2:gravestone2_polished_granite" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/treasure2/recipes/gravestone3_polished_granite.json b/src/generated/resources/data/treasure2/recipes/gravestone3_polished_granite.json new file mode 100644 index 000000000..afb5d54fc --- /dev/null +++ b/src/generated/resources/data/treasure2/recipes/gravestone3_polished_granite.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " xt", + " x ", + " x " + ], + "key": { + "x": { + "item": "minecraft:polished_granite" + }, + "t": { + "item": "treasure2:treasure_tool" + } + }, + "result": { + "item": "treasure2:gravestone3_polished_granite" + } +} \ No newline at end of file